wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

YongHao Hu : msvcp110: Add tr2_sys__Stat and tr2_sys__Lstat implementation and test.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 5520ce5522df224cef65b9adce6ac337095753f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5520ce5522df224cef65b9adc… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Fri Aug 7 01:15:12 2015 +0800 msvcp110: Add tr2_sys__Stat and tr2_sys__Lstat implementation and test. --- dlls/msvcp110/msvcp110.spec | 8 +-- dlls/msvcp120/msvcp120.spec | 8 +-- dlls/msvcp120/tests/msvcp120.c | 106 ++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 8 +-- dlls/msvcp90/ios.c | 47 ++++++++++++++++ 5 files changed, 165 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5520ce5522df224cef65b…

1 0

Iván Matellanes : msvcirt: Implement filebuf:: seekoff.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: d5229aeec52ca0d00f0ba96d267a7384b7510204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5229aeec52ca0d00f0ba96d2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 10 20:09:30 2015 +0200 msvcirt: Implement filebuf::seekoff. --- dlls/msvcirt/msvcirt.c | 11 +++++++---- dlls/msvcirt/tests/msvcirt.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 580af82..ff31e8c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -968,11 +968,12 @@ filebuf* __thiscall filebuf_open(filebuf *this, const char *name, ios_open_mode streambuf_lock(&this->base); this->close = 1; + this->fd = fd; if ((mode & OPENMODE_ate) && call_streambuf_seekoff(&this->base, 0, SEEKDIR_end, mode & (OPENMODE_in|OPENMODE_out)) == EOF) { _close(fd); - } else - this->fd = fd; + this->fd = -1; + } streambuf_allocate(&this->base); streambuf_unlock(&this->base); return (this->fd == -1) ? NULL : this; @@ -1003,8 +1004,10 @@ int __thiscall filebuf_overflow(filebuf *this, int c) DEFINE_THISCALL_WRAPPER(filebuf_seekoff, 16) streampos __thiscall filebuf_seekoff(filebuf *this, streamoff offset, ios_seek_dir dir, int mode) { - FIXME("(%p %d %d %d) stub\n", this, offset, dir, mode); - return 0; + TRACE("(%p %d %d %d)\n", this, offset, dir, mode); + if (call_streambuf_sync(&this->base) == EOF) + return EOF; + return _lseek(this->fd, offset, dir); } /* ?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index de53889..b381b30 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -24,6 +24,8 @@ #include "wine/test.h" typedef void (*vtable_ptr)(void); +typedef LONG streamoff; +typedef LONG streampos; typedef int filedesc; typedef enum { @@ -45,6 +47,12 @@ typedef enum { } ios_open_mode; typedef enum { + SEEKDIR_beg = 0, + SEEKDIR_cur = 1, + SEEKDIR_end = 2 +} ios_seek_dir; + +typedef enum { FLAGS_skipws = 0x1, FLAGS_left = 0x2, FLAGS_right = 0x4, @@ -162,6 +170,7 @@ static streambuf* (*__thiscall p_filebuf_setbuf)(filebuf*, char*, int); static int (*__thiscall p_filebuf_sync)(filebuf*); static int (*__thiscall p_filebuf_overflow)(filebuf*, int); static int (*__thiscall p_filebuf_underflow)(filebuf*); +static streampos (*__thiscall p_filebuf_seekoff)(filebuf*, streamoff, ios_seek_dir, int); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -305,6 +314,7 @@ static BOOL init(void) SET(p_filebuf_sync, "?sync@filebuf@@UEAAHXZ"); SET(p_filebuf_overflow, "?overflow@filebuf@@UEAAHH@Z"); SET(p_filebuf_underflow, "?underflow@filebuf@@UEAAHXZ"); + SET(p_filebuf_seekoff, "?seekoff@filebuf@@UEAAJJW4seek_dir@ios@@H@Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA@XZ"); @@ -368,6 +378,7 @@ static BOOL init(void) SET(p_filebuf_sync, "?sync@filebuf@@UAEHXZ"); SET(p_filebuf_overflow, "?overflow@filebuf@@UAEHH@Z"); SET(p_filebuf_underflow, "?underflow@filebuf@@UAEHXZ"); + SET(p_filebuf_seekoff, "?seekoff@filebuf@@UAEJJW4seek_dir@ios@@H@Z"); SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE@XZ"); @@ -1305,6 +1316,35 @@ static void test_filebuf(void) ret = (int) call_func1(p_filebuf_underflow, &fb2); ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + /* seekoff */ + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 5, SEEKDIR_beg, 0); + ok(ret == 5, "wrong return, expected 5 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.ebuf; + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 0, SEEKDIR_beg, 0); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + fb1.base.eback = fb1.base.gptr = fb1.base.egptr = NULL; + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 10, SEEKDIR_beg, OPENMODE_in|OPENMODE_out); + ok(ret == 10, "wrong return, expected 10 got %d\n", ret); + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 0, SEEKDIR_cur, 0); + ok(ret == 10, "wrong return, expected 10 got %d\n", ret); + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 200, SEEKDIR_cur, OPENMODE_in); + ok(ret == 210, "wrong return, expected 210 got %d\n", ret); + ret = (int) call_func4(p_filebuf_seekoff, &fb1, -60, SEEKDIR_cur, 0); + ok(ret == 150, "wrong return, expected 150 got %d\n", ret); + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 0, SEEKDIR_end, 0); + ok(ret == 106, "wrong return, expected 106 got %d\n", ret); + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 20, SEEKDIR_end, OPENMODE_out); + ok(ret == 126, "wrong return, expected 126 got %d\n", ret); + ret = (int) call_func4(p_filebuf_seekoff, &fb1, -150, SEEKDIR_end, -1); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 10, 3, 0); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + ret = (int) call_func4(p_filebuf_seekoff, &fb1, 16, SEEKDIR_beg, 0); + ok(ret == 16, "wrong return, expected 16 got %d\n", ret); + /* close */ pret = (filebuf*) call_func1(p_filebuf_close, &fb2); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret);

1 0

Iván Matellanes : msvcirt: Implement filebuf:: underflow.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 0ed82afe9ebc398960d913ce538da62cb96adeea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed82afe9ebc398960d913ce5… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 10 20:09:26 2015 +0200 msvcirt: Implement filebuf::underflow. --- dlls/msvcirt/msvcirt.c | 21 +++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1eb04cb..580af82 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1088,8 +1088,25 @@ int __thiscall filebuf_sync(filebuf *this) DEFINE_THISCALL_WRAPPER(filebuf_underflow, 4) int __thiscall filebuf_underflow(filebuf *this) { - FIXME("(%p) stub\n", this); - return EOF; + int buffer_size, read_bytes; + char c; + + TRACE("(%p)\n", this); + + if (this->base.unbuffered) + return (_read(this->fd, &c, 1) < 1) ? EOF : c; + + if (this->base.gptr >= this->base.egptr) { + if (call_streambuf_sync(&this->base) == EOF) + return EOF; + buffer_size = this->base.ebuf - this->base.base; + read_bytes = _read(this->fd, this->base.base, buffer_size); + if (read_bytes <= 0) + return EOF; + this->base.eback = this->base.gptr = this->base.base; + this->base.egptr = this->base.base + read_bytes; + } + return *this->base.gptr; } /* ??0ios@@IAE@ABV0@@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 1059e3a..de53889 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -161,6 +161,7 @@ static int (*__thiscall p_filebuf_setmode)(filebuf*, int); static streambuf* (*__thiscall p_filebuf_setbuf)(filebuf*, char*, int); static int (*__thiscall p_filebuf_sync)(filebuf*); static int (*__thiscall p_filebuf_overflow)(filebuf*, int); +static int (*__thiscall p_filebuf_underflow)(filebuf*); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -303,6 +304,7 @@ static BOOL init(void) SET(p_filebuf_setbuf, "?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z"); SET(p_filebuf_sync, "?sync@filebuf@@UEAAHXZ"); SET(p_filebuf_overflow, "?overflow@filebuf@@UEAAHH@Z"); + SET(p_filebuf_underflow, "?underflow@filebuf@@UEAAHXZ"); SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA@XZ"); @@ -365,6 +367,7 @@ static BOOL init(void) SET(p_filebuf_setbuf, "?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z"); SET(p_filebuf_sync, "?sync@filebuf@@UAEHXZ"); SET(p_filebuf_overflow, "?overflow@filebuf@@UAEHH@Z"); + SET(p_filebuf_underflow, "?underflow@filebuf@@UAEHXZ"); SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE@XZ"); @@ -1261,10 +1264,46 @@ static void test_filebuf(void) fb2.base.do_lock = -1; ret = (int) call_func2(p_filebuf_overflow, &fb2, EOF); ok(ret == 1, "wrong return, expected 1 got %d\n", ret); + + /* underflow */ + ret = (int) call_func1(p_filebuf_underflow, &fb1); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.pbase = fb1.base.pptr = fb1.base.base + 256; + fb1.base.epptr = fb1.base.ebuf; + *fb1.base.gptr = 'A'; + ret = (int) call_func1(p_filebuf_underflow, &fb1); + ok(ret == 'A', "wrong return, expected 'A' got %d\n", ret); + ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + ok(fb1.base.pptr == fb1.base.base + 256, "wrong put pointer, expected %p got %p\n", fb1.base.base + 256, fb1.base.pptr); + fb1.base.gptr = fb1.base.ebuf; + ret = (int) call_func1(p_filebuf_underflow, &fb1); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + ok(_lseek(fb1.fd, 0, SEEK_SET) == 0, "_lseek failed\n"); + ret = (int) call_func1(p_filebuf_underflow, &fb1); + ok(ret == 'f', "wrong return, expected 'f' got %d\n", ret); + 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 + 106, "wrong get end pointer, expected %p got %p\n", fb1.base.base + 106, fb1.base.egptr); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + ret = (int) call_func1(p_filebuf_underflow, &fb2); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + ok(_write(fb2.fd, "A\n", 2) == 2, "_write failed\n"); + ok(_lseek(fb2.fd, 0, SEEK_SET) == 0, "_lseek failed\n"); + ret = (int) call_func1(p_filebuf_underflow, &fb2); + ok(ret == 'A', "wrong return, expected 'A' got %d\n", ret); + ret = (int) call_func1(p_filebuf_underflow, &fb2); + ok(ret == '\n', "wrong return, expected '\\n' got %d\n", ret); fb2.base.do_lock = 0; pret = (filebuf*) call_func1(p_filebuf_close, &fb2); ok(pret == &fb2, "wrong return, expected %p got %p\n", &fb2, pret); fb2.base.do_lock = -1; + ret = (int) call_func1(p_filebuf_underflow, &fb2); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); /* close */ pret = (filebuf*) call_func1(p_filebuf_close, &fb2);

1 0

Iván Matellanes : msvcirt: Implement filebuf:: overflow.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: ed5f60e46f0890d5dbea085c5ef0109f99b96b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5f60e46f0890d5dbea085c5… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 10 20:09:20 2015 +0200 msvcirt: Implement filebuf::overflow. --- dlls/msvcirt/msvcirt.c | 15 +++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 9dc2c63..1eb04cb 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -983,8 +983,19 @@ filebuf* __thiscall filebuf_open(filebuf *this, const char *name, ios_open_mode DEFINE_THISCALL_WRAPPER(filebuf_overflow, 8) int __thiscall filebuf_overflow(filebuf *this, int c) { - FIXME("(%p %d) stub\n", this, c); - return EOF; + TRACE("(%p %d)\n", this, c); + if (call_streambuf_sync(&this->base) == EOF) + return EOF; + if (this->base.unbuffered) + return (c == EOF) ? 1 : _write(this->fd, &c, 1); + if (streambuf_allocate(&this->base) == EOF) + return EOF; + + this->base.pbase = this->base.pptr = this->base.base; + this->base.epptr = this->base.ebuf; + if (c != EOF) + *this->base.pptr++ = c; + return 1; } /* ?seekoff@filebuf@@UAEJJW4seek_dir@ios@@H@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3dccb67..1059e3a 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -160,6 +160,7 @@ static filebuf* (*__thiscall p_filebuf_close)(filebuf*); static int (*__thiscall p_filebuf_setmode)(filebuf*, int); static streambuf* (*__thiscall p_filebuf_setbuf)(filebuf*, char*, int); static int (*__thiscall p_filebuf_sync)(filebuf*); +static int (*__thiscall p_filebuf_overflow)(filebuf*, int); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -301,6 +302,7 @@ static BOOL init(void) SET(p_filebuf_setmode, "?setmode@filebuf@@QEAAHH@Z"); SET(p_filebuf_setbuf, "?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z"); SET(p_filebuf_sync, "?sync@filebuf@@UEAAHXZ"); + SET(p_filebuf_overflow, "?overflow@filebuf@@UEAAHH@Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA@XZ"); @@ -362,6 +364,7 @@ static BOOL init(void) SET(p_filebuf_setmode, "?setmode@filebuf@@QAEHH@Z"); SET(p_filebuf_setbuf, "?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z"); SET(p_filebuf_sync, "?sync@filebuf@@UAEHXZ"); + SET(p_filebuf_overflow, "?overflow@filebuf@@UAEHH@Z"); SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE@XZ"); @@ -1225,6 +1228,44 @@ static void test_filebuf(void) fb3.base.eback = fb3.base.gptr = fb3.base.egptr = NULL; fb3.base.pbase = fb3.base.pptr = fb3.base.epptr = NULL; + /* overflow */ + ret = (int) call_func2(p_filebuf_overflow, &fb1, EOF); + ok(ret == 1, "wrong return, expected 1 got %d\n", ret); + fb1.base.pbase = fb1.base.pptr = fb1.base.epptr = NULL; + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.ebuf; + ret = (int) call_func2(p_filebuf_overflow, &fb1, 'a'); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + fb1.base.gptr = fb1.base.egptr = fb1.base.pbase = fb1.base.pptr = fb1.base.base + 256; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "I just want to tell you how I'm feeling", 39); + ok(ret == 39, "wrong return, expected 39 got %d\n", ret); + ret = (int) call_func2(p_filebuf_overflow, &fb1, '\n'); + ok(ret == 1, "wrong return, expected 1 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + 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 + 1, "wrong put pointer, expected %p got %p\n", fb1.base.base + 1, fb1.base.pptr); + ok(fb1.base.epptr == fb1.base.ebuf, "wrong put end pointer, expected %p got %p\n", fb1.base.ebuf, fb1.base.epptr); + ok(*fb1.base.pbase == '\n', "wrong character, expected '\\n' got '%c'\n", *fb1.base.pbase); + ret = (int) call_func2(p_filebuf_overflow, &fb1, EOF); + ok(ret == 1, "wrong return, expected 1 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + 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, "wrong put pointer, expected %p got %p\n", fb1.base.base, fb1.base.pptr); + ok(fb1.base.epptr == fb1.base.ebuf, "wrong put end pointer, expected %p got %p\n", fb1.base.ebuf, fb1.base.epptr); + ret = (int) call_func2(p_filebuf_overflow, &fb2, EOF); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + fb2.base.do_lock = 0; + pret = (filebuf*) call_func4(p_filebuf_open, &fb2, filename2, OPENMODE_in|OPENMODE_out, filebuf_openprot); + ok(pret == &fb2, "wrong return, expected %p got %p\n", &fb2, pret); + fb2.base.do_lock = -1; + ret = (int) call_func2(p_filebuf_overflow, &fb2, EOF); + ok(ret == 1, "wrong return, expected 1 got %d\n", ret); + fb2.base.do_lock = 0; + pret = (filebuf*) call_func1(p_filebuf_close, &fb2); + ok(pret == &fb2, "wrong return, expected %p got %p\n", &fb2, pret); + fb2.base.do_lock = -1; + /* close */ pret = (filebuf*) call_func1(p_filebuf_close, &fb2); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret);

1 0

Iván Matellanes : msvcirt: Implement filebuf::sync.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 5ebf8cfc40656b896a80310802373ffbf3d1ab38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ebf8cfc40656b896a8031080… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 10 20:09:14 2015 +0200 msvcirt: Implement filebuf::sync. --- dlls/msvcirt/msvcirt.c | 35 ++++++++++++++++++++++- dlls/msvcirt/tests/msvcirt.c | 68 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 17525cf..9dc2c63 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1035,7 +1035,40 @@ int __thiscall filebuf_setmode(filebuf *this, int mode) DEFINE_THISCALL_WRAPPER(filebuf_sync, 4) int __thiscall filebuf_sync(filebuf *this) { - FIXME("(%p) stub\n", this); + int count, mode; + char *ptr; + LONG offset; + + TRACE("(%p)\n", this); + if (this->fd == -1) + return EOF; + if (this->base.unbuffered) + return 0; + + /* flush output buffer */ + if (this->base.pptr != NULL) { + count = this->base.pptr - this->base.pbase; + if (count > 0 && _write(this->fd, this->base.pbase, count) != count) + return EOF; + this->base.pbase = this->base.pptr = this->base.epptr = NULL; + } + /* flush input buffer */ + if (this->base.egptr != NULL) { + offset = this->base.egptr - this->base.gptr; + if (offset > 0) { + mode = _setmode(this->fd, _O_TEXT); + _setmode(this->fd, mode); + if (mode & _O_TEXT) { + /* in text mode, '\n' in the buffer means '\r\n' in the file */ + for (ptr = this->base.gptr; ptr < this->base.egptr; ptr++) + if (*ptr == '\n') + offset++; + } + if (_lseek(this->fd, -offset, SEEK_CUR) < 0) + return EOF; + } + this->base.eback = this->base.gptr = this->base.egptr = NULL; + } return 0; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 559bee0..3dccb67 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -159,6 +159,7 @@ static filebuf* (*__thiscall p_filebuf_open)(filebuf*, const char*, ios_open_mod static filebuf* (*__thiscall p_filebuf_close)(filebuf*); static int (*__thiscall p_filebuf_setmode)(filebuf*, int); static streambuf* (*__thiscall p_filebuf_setbuf)(filebuf*, char*, int); +static int (*__thiscall p_filebuf_sync)(filebuf*); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -299,6 +300,7 @@ static BOOL init(void) SET(p_filebuf_close, "?close@filebuf@@QEAAPEAV1@XZ"); SET(p_filebuf_setmode, "?setmode@filebuf@@QEAAHH@Z"); SET(p_filebuf_setbuf, "?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z"); + SET(p_filebuf_sync, "?sync@filebuf@@UEAAHXZ"); SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA@XZ"); @@ -359,6 +361,7 @@ static BOOL init(void) SET(p_filebuf_close, "?close@filebuf@@QAEPAV1@XZ"); SET(p_filebuf_setmode, "?setmode@filebuf@@QAEHH@Z"); SET(p_filebuf_setbuf, "?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z"); + SET(p_filebuf_sync, "?sync@filebuf@@UAEHXZ"); SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE@XZ"); @@ -1127,8 +1130,9 @@ static void test_filebuf(void) /* open protection*/ fb3.fd = -1; fb3.base.do_lock = 0; - pret = (filebuf*) call_func4(p_filebuf_open, &fb3, filename3, OPENMODE_in, filebuf_openprot); + pret = (filebuf*) call_func4(p_filebuf_open, &fb3, filename3, OPENMODE_in|OPENMODE_out, filebuf_openprot); ok(pret == &fb3, "wrong return, expected %p got %p\n", &fb3, pret); + ok(_write(fb3.fd, "You wouldn't\nget this from\nany other guy", 40) == 40, "_write failed\n"); fb2.base.do_lock = 0; pret = (filebuf*) call_func4(p_filebuf_open, &fb2, filename3, OPENMODE_in|OPENMODE_out, filebuf_openprot); ok(pret == &fb2, "wrong return, expected %p got %p\n", &fb2, pret); @@ -1149,7 +1153,6 @@ static void test_filebuf(void) fb1.base.epptr = fb1.base.ebuf; ret = (int) call_func2(p_filebuf_setmode, &fb1, filebuf_binary); ok(ret == filebuf_text, "wrong return, expected %d got %d\n", filebuf_text, ret); -todo_wine ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); ret = (int) call_func2(p_filebuf_setmode, &fb1, filebuf_binary); ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); @@ -1161,6 +1164,67 @@ todo_wine ok(ret == -1, "wrong return, expected -1 got %d\n", ret); fb2.base.do_lock = -1; + /* sync */ + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + fb1.base.eback = fb1.base.gptr = fb1.base.base; + fb1.base.egptr = fb1.base.pbase = fb1.base.pptr = fb1.base.base + 256; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "We're no strangers to love\n", 27); + ok(ret == 27, "wrong return, expected 27 got %d\n", ret); + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + fb1.base.eback = fb1.base.gptr = fb1.base.egptr = NULL; + fb1.base.pbase = fb1.base.pptr = fb1.base.base; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "You know the rules and so do I\n", 31); + ok(ret == 31, "wrong return, expected 31 got %d\n", ret); + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + fb1.base.eback = fb1.base.base; + fb1.base.gptr = fb1.base.base + 190; + fb1.base.egptr = fb1.base.pbase = fb1.base.pptr = fb1.base.base + 256; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func1(p_filebuf_sync, &fb1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + ok(_tell(fb1.fd) == 0, "_tell failed\n"); + ret = (int) call_func1(p_filebuf_sync, &fb2); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + fb3.base.eback = fb3.base.base; + fb3.base.gptr = fb3.base.egptr = fb3.base.pbase = fb3.base.pptr = fb3.base.base + 256; + fb3.base.epptr = fb3.base.ebuf; + ret = (int) call_func3(p_streambuf_xsputn, &fb3.base, "A full commitment's what I'm thinking of\n", 41); + ok(ret == 41, "wrong return, expected 41 got %d\n", ret); + ret = (int) call_func1(p_filebuf_sync, &fb3); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + ok(fb3.base.gptr == fb3.base.base + 256, "wrong get pointer, expected %p got %p\n", fb3.base.base + 256, fb3.base.gptr); + ok(fb3.base.pptr == fb3.base.base + 297, "wrong put pointer, expected %p got %p\n", fb3.base.base + 297, fb3.base.pptr); + fb3.base.eback = fb3.base.base; + fb3.base.gptr = fb3.base.egptr = fb3.base.pbase = fb3.base.pptr = fb3.base.base + 256; + fb3.base.epptr = fb3.base.ebuf; + ret = (int) call_func1(p_filebuf_sync, &fb3); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb3.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb3.base.gptr); + ok(fb3.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb3.base.pptr); + fb3.base.eback = fb3.base.base; + fb3.base.gptr = fb3.base.base + 216; + fb3.base.egptr = fb3.base.pbase = fb3.base.pptr = fb3.base.base + 256; + fb3.base.epptr = fb3.base.ebuf; + ok(_read(fb3.fd, fb3.base.gptr, 42) == 40, "read failed\n"); + ret = (int) call_func1(p_filebuf_sync, &fb3); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(fb3.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb3.base.gptr); + ok(fb3.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb3.base.pptr); + ok(_tell(fb3.fd) == 0, "_tell failed\n"); + fb3.base.eback = fb3.base.gptr = fb3.base.egptr = NULL; + fb3.base.pbase = fb3.base.pptr = fb3.base.epptr = NULL; + /* close */ pret = (filebuf*) call_func1(p_filebuf_close, &fb2); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret);

1 0

Iván Matellanes : msvcirt: Implement filebuf::setbuf.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 28c61981ad7acc005177ae91ebcdac3c112fbfd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c61981ad7acc005177ae91e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 10 20:09:07 2015 +0200 msvcirt: Implement filebuf::setbuf. --- dlls/msvcirt/msvcirt.c | 12 ++++++++++-- dlls/msvcirt/tests/msvcirt.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 83184a0..17525cf 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1001,8 +1001,16 @@ streampos __thiscall filebuf_seekoff(filebuf *this, streamoff offset, ios_seek_d DEFINE_THISCALL_WRAPPER(filebuf_setbuf, 12) streambuf* __thiscall filebuf_setbuf(filebuf *this, char *buffer, int length) { - FIXME("(%p %p %d) stub\n", this, buffer, length); - return NULL; + streambuf *ret; + + TRACE("(%p %p %d)\n", this, buffer, length); + if (this->base.base != NULL) + return NULL; + + streambuf_lock(&this->base); + ret = streambuf_setbuf(&this->base, buffer, length); + streambuf_unlock(&this->base); + return ret; } /* ?setmode@filebuf@@QAEHH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 5a58dfd..559bee0 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -158,6 +158,7 @@ static filebuf* (*__thiscall p_filebuf_attach)(filebuf*, filedesc); static filebuf* (*__thiscall p_filebuf_open)(filebuf*, const char*, ios_open_mode, int); static filebuf* (*__thiscall p_filebuf_close)(filebuf*); static int (*__thiscall p_filebuf_setmode)(filebuf*, int); +static streambuf* (*__thiscall p_filebuf_setbuf)(filebuf*, char*, int); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -297,6 +298,7 @@ static BOOL init(void) SET(p_filebuf_open, "?open@filebuf@@QEAAPEAV1@PEBDHH@Z"); SET(p_filebuf_close, "?close@filebuf@@QEAAPEAV1@XZ"); SET(p_filebuf_setmode, "?setmode@filebuf@@QEAAHH@Z"); + SET(p_filebuf_setbuf, "?setbuf@filebuf@@UEAAPEAVstreambuf@@PEADH@Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA@XZ"); @@ -356,6 +358,7 @@ static BOOL init(void) SET(p_filebuf_open, "?open@filebuf@@QAEPAV1@PBDHH@Z"); SET(p_filebuf_close, "?close@filebuf@@QAEPAV1@XZ"); SET(p_filebuf_setmode, "?setmode@filebuf@@QAEHH@Z"); + SET(p_filebuf_setbuf, "?setbuf@filebuf@@UAEPAVstreambuf@@PADH@Z"); SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE@XZ"); @@ -997,6 +1000,33 @@ static void test_filebuf(void) ok(thread != NULL, "CreateThread failed\n"); WaitForSingleObject(lock_arg.lock, INFINITE); + /* setbuf */ + fb1.base.do_lock = 0; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 16); + ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == NULL, "wrong put area, expected %p got %p\n", NULL, fb1.base.pbase); + fb1.base.pbase = fb1.base.pptr = fb1.base.base; + fb1.base.epptr = fb1.base.ebuf; + fb1.base.do_lock = -1; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 16); + ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.base == read_buffer, "wrong buffer, expected %p got %p\n", read_buffer, fb1.base.base); + ok(fb1.base.pbase == read_buffer, "wrong put area, expected %p got %p\n", read_buffer, fb1.base.pbase); + fb1.base.base = fb1.base.ebuf = NULL; + fb1.base.do_lock = 0; + pret = (filebuf*) call_func3(p_filebuf_setbuf, &fb1, read_buffer, 0); + ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); + ok(fb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", fb1.base.unbuffered); + ok(fb1.base.base == NULL, "wrong buffer, expected %p got %p\n", NULL, fb1.base.base); + ok(fb1.base.pbase == read_buffer, "wrong put area, expected %p got %p\n", read_buffer, fb1.base.pbase); + fb1.base.pbase = fb1.base.pptr = fb1.base.epptr = NULL; + fb1.base.unbuffered = 0; + fb1.base.do_lock = -1; + /* attach */ pret = (filebuf*) call_func2(p_filebuf_attach, &fb1, 2); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret);

1 0

Iván Matellanes : msvcirt: Implement filebuf:: setmode.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 43bb816373e4c1d6fbb581e27f68e1e1bc6df79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bb816373e4c1d6fbb581e27… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 10 20:09:01 2015 +0200 msvcirt: Implement filebuf::setmode. --- dlls/msvcirt/msvcirt.c | 16 ++++++++++++---- dlls/msvcirt/tests/msvcirt.c | 25 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7caa05b..83184a0 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -45,9 +45,9 @@ const int filebuf_sh_write = 0xc00; /* ?openprot@filebuf@@2HB */ const int filebuf_openprot = 420; /* ?binary@filebuf@@2HB */ -const int filebuf_binary = 0x8000; +const int filebuf_binary = _O_BINARY; /* ?text@filebuf@@2HB */ -const int filebuf_text = 0x4000; +const int filebuf_text = _O_TEXT; /* ?adjustfield@ios@@2JB */ const LONG ios_adjustfield = FLAGS_left | FLAGS_right | FLAGS_internal; @@ -1010,8 +1010,16 @@ streambuf* __thiscall filebuf_setbuf(filebuf *this, char *buffer, int length) DEFINE_THISCALL_WRAPPER(filebuf_setmode, 8) int __thiscall filebuf_setmode(filebuf *this, int mode) { - FIXME("(%p %d) stub\n", this, mode); - return 0; + int ret; + + TRACE("(%p %d)\n", this, mode); + if (mode != filebuf_text && mode != filebuf_binary) + return -1; + + streambuf_lock(&this->base); + ret = (call_streambuf_sync(&this->base) == EOF) ? -1 : _setmode(this->fd, mode); + streambuf_unlock(&this->base); + return ret; } /* ?sync@filebuf@@UAEHXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 0977173..5a58dfd 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <fcntl.h> #include <io.h> #include <stdio.h> #include <windef.h> @@ -65,6 +66,8 @@ const int filebuf_sh_none = 0x800; const int filebuf_sh_read = 0xa00; const int filebuf_sh_write = 0xc00; const int filebuf_openprot = 420; +const int filebuf_binary = _O_BINARY; +const int filebuf_text = _O_TEXT; /* class streambuf */ typedef struct { @@ -154,6 +157,7 @@ static void (*__thiscall p_filebuf_dtor)(filebuf*); static filebuf* (*__thiscall p_filebuf_attach)(filebuf*, filedesc); static filebuf* (*__thiscall p_filebuf_open)(filebuf*, const char*, ios_open_mode, int); static filebuf* (*__thiscall p_filebuf_close)(filebuf*); +static int (*__thiscall p_filebuf_setmode)(filebuf*, int); /* ios */ static ios* (*__thiscall p_ios_copy_ctor)(ios*, const ios*); @@ -292,6 +296,7 @@ static BOOL init(void) SET(p_filebuf_attach, "?attach@filebuf@@QEAAPEAV1@H@Z"); SET(p_filebuf_open, "?open@filebuf@@QEAAPEAV1@PEBDHH@Z"); SET(p_filebuf_close, "?close@filebuf@@QEAAPEAV1@XZ"); + SET(p_filebuf_setmode, "?setmode@filebuf@@QEAAHH@Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA@AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA@XZ"); @@ -350,6 +355,7 @@ static BOOL init(void) SET(p_filebuf_attach, "?attach@filebuf@@QAEPAV1@H@Z"); SET(p_filebuf_open, "?open@filebuf@@QAEPAV1@PBDHH@Z"); SET(p_filebuf_close, "?close@filebuf@@QAEPAV1@XZ"); + SET(p_filebuf_setmode, "?setmode@filebuf@@QAEHH@Z"); SET(p_ios_copy_ctor, "??0ios@@IAE@ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE@XZ"); @@ -957,6 +963,7 @@ static void test_filebuf(void) const char filename2[] = "test2"; const char filename3[] = "test3"; char read_buffer[16]; + int ret; memset(&fb1, 0xab, sizeof(filebuf)); memset(&fb2, 0xab, sizeof(filebuf)); @@ -1106,6 +1113,24 @@ static void test_filebuf(void) ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret); fb3.base.do_lock = -1; + /* setmode */ + fb1.base.do_lock = 0; + fb1.base.pbase = fb1.base.pptr = fb1.base.base; + fb1.base.epptr = fb1.base.ebuf; + ret = (int) call_func2(p_filebuf_setmode, &fb1, filebuf_binary); + ok(ret == filebuf_text, "wrong return, expected %d got %d\n", filebuf_text, ret); +todo_wine + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + ret = (int) call_func2(p_filebuf_setmode, &fb1, filebuf_binary); + ok(ret == filebuf_binary, "wrong return, expected %d got %d\n", filebuf_binary, ret); + fb1.base.do_lock = -1; + ret = (int) call_func2(p_filebuf_setmode, &fb1, 0x9000); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + fb2.base.do_lock = 0; + ret = (int) call_func2(p_filebuf_setmode, &fb2, filebuf_text); + ok(ret == -1, "wrong return, expected -1 got %d\n", ret); + fb2.base.do_lock = -1; + /* close */ pret = (filebuf*) call_func1(p_filebuf_close, &fb2); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret);

1 0

Iván Matellanes : msvcirt: Allocate a buffer if necessary when a file is opened.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: cac27a40d8197a514b59a8f850ce62340cec87a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac27a40d8197a514b59a8f85… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 10 20:08:54 2015 +0200 msvcirt: Allocate a buffer if necessary when a file is opened. --- dlls/msvcirt/msvcirt.c | 1 + dlls/msvcirt/tests/msvcirt.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index bf89650..7caa05b 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -973,6 +973,7 @@ filebuf* __thiscall filebuf_open(filebuf *this, const char *name, ios_open_mode _close(fd); } else this->fd = fd; + streambuf_allocate(&this->base); streambuf_unlock(&this->base); return (this->fd == -1) ? NULL : this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index e0bda56..0977173 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -1016,9 +1016,11 @@ static void test_filebuf(void) pret = (filebuf*) call_func4(p_filebuf_open, &fb1, filename1, OPENMODE_ate|OPENMODE_nocreate|OPENMODE_noreplace|OPENMODE_binary, filebuf_openprot); ok(pret == NULL, "wrong return, expected %p got %p\n", NULL, pret); + ok(fb1.base.allocated == 0, "wrong allocate value, expected 0 got %d\n", fb1.base.allocated); fb1.base.do_lock = 0; pret = (filebuf*) call_func4(p_filebuf_open, &fb1, filename1, OPENMODE_out, filebuf_openprot); ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret); + ok(fb1.base.allocated == 1, "wrong allocate value, expected 1 got %d\n", fb1.base.allocated); ok(_write(fb1.fd, "testing", 7) == 7, "_write failed\n"); pret = (filebuf*) call_func1(p_filebuf_close, &fb1); ok(pret == &fb1, "wrong return, expected %p got %p\n", &fb1, pret);

1 0

André Hentschel : ntdll/tests: Add ARM64 support for map protection tests.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: c4cd981a61d2dfc20053051b284bd8d3ed1512b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4cd981a61d2dfc20053051b2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 20:10:37 2015 +0200 ntdll/tests: Add ARM64 support for map protection tests. --- dlls/ntdll/tests/info.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4111be4..83fdd53 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1442,6 +1442,8 @@ static void test_mapprotection(void) *(unsigned char*)addr = 0xc3; /* lret ... in both i386 and x86_64 */ #elif defined(__arm__) *(unsigned long*)addr = 0xe12fff1e; /* bx lr */ +#elif defined(__aarch64__) + *(unsigned long*)addr = 0xd65f03c0; /* ret */ #else ok(0, "Add a return opcode for your architecture or expect a crash in this test\n"); #endif

1 0

André Hentschel : rpcrt4: Add ARM support.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: ef783d62ccdf2cc9dce7490d07acf2e803ca1708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef783d62ccdf2cc9dce7490d0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:09:24 2015 +0200 rpcrt4: Add ARM support. --- dlls/rpcrt4/ndr_stubless.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index dbdf873..033c650 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1094,6 +1094,40 @@ __ASM_GLOBAL_FUNC( call_server_func, __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") +#elif defined __arm__ +LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char *args, unsigned int stack_size); +__ASM_GLOBAL_FUNC( call_server_func, + ".arm\n\t" + "push {r4, r5, LR}\n\t" + "mov r4, r0\n\t" + "mov r5, SP\n\t" + "lsr r3, r2, #2\n\t" + "cmp r3, #0\n\t" + "beq 5f\n\t" + "sub SP, SP, r2\n\t" + "tst r3, #1\n\t" + "subeq SP, SP, #4\n\t" + "1:\tsub r2, r2, #4\n\t" + "ldr r0, [r1, r2]\n\t" + "str r0, [SP, r2]\n\t" + "cmp r2, #0\n\t" + "bgt 1b\n\t" + "cmp r3, #1\n\t" + "bgt 2f\n\t" + "pop {r0}\n\t" + "b 5f\n\t" + "2:\tcmp r3, #2\n\t" + "bgt 3f\n\t" + "pop {r0-r1}\n\t" + "b 5f\n\t" + "3:\tcmp r3, #3\n\t" + "bgt 4f\n\t" + "pop {r0-r2}\n\t" + "b 5f\n\t" + "4:\tpop {r0-r3}\n\t" + "5:\tblx r4\n\t" + "mov SP, r5\n\t" + "pop {r4, r5, PC}" ) #else #warning call_server_func not implemented for your architecture LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned short stack_size)

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
51
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 August 2015