August 2015 - Wine-commits - list.winehq.org

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(a)filebuf@@UAEJJW4seek_dir(a)ios@@H(a)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(a)filebuf@@QEAAHH(a)Z"); SET(p_filebuf_setbuf, "?setbuf(a)filebuf@@UEAAPEAVstreambuf@@PEADH(a)Z"); SET(p_filebuf_sync, "?sync(a)filebuf@@UEAAHXZ"); + SET(p_filebuf_overflow, "?overflow(a)filebuf@@UEAAHH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -362,6 +364,7 @@ static BOOL init(void) SET(p_filebuf_setmode, "?setmode(a)filebuf@@QAEHH(a)Z"); SET(p_filebuf_setbuf, "?setbuf(a)filebuf@@UAEPAVstreambuf@@PADH(a)Z"); SET(p_filebuf_sync, "?sync(a)filebuf@@UAEHXZ"); + SET(p_filebuf_overflow, "?overflow(a)filebuf@@UAEHH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)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:: 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(a)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(a)filebuf@@UEAAPEAVstreambuf@@PEADH(a)Z"); SET(p_filebuf_sync, "?sync(a)filebuf@@UEAAHXZ"); SET(p_filebuf_overflow, "?overflow(a)filebuf@@UEAAHH(a)Z"); + SET(p_filebuf_underflow, "?underflow(a)filebuf@@UEAAHXZ"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -365,6 +367,7 @@ static BOOL init(void) SET(p_filebuf_setbuf, "?setbuf(a)filebuf@@UAEPAVstreambuf@@PADH(a)Z"); SET(p_filebuf_sync, "?sync(a)filebuf@@UAEHXZ"); SET(p_filebuf_overflow, "?overflow(a)filebuf@@UAEHH(a)Z"); + SET(p_filebuf_underflow, "?underflow(a)filebuf@@UAEHXZ"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)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:: 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(a)filebuf@@UAEPAVstreambuf@@PADH(a)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(a)filebuf@@UEAAHXZ"); SET(p_filebuf_overflow, "?overflow(a)filebuf@@UEAAHH(a)Z"); SET(p_filebuf_underflow, "?underflow(a)filebuf@@UEAAHXZ"); + SET(p_filebuf_seekoff, "?seekoff(a)filebuf@@UEAAJJW4seek_dir(a)ios@@H(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -368,6 +378,7 @@ static BOOL init(void) SET(p_filebuf_sync, "?sync(a)filebuf@@UAEHXZ"); SET(p_filebuf_overflow, "?overflow(a)filebuf@@UAEHH(a)Z"); SET(p_filebuf_underflow, "?underflow(a)filebuf@@UAEHXZ"); + SET(p_filebuf_seekoff, "?seekoff(a)filebuf@@UAEJJW4seek_dir(a)ios@@H(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)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

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

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

17 Aug '15

Module: wine Branch: master Commit: 589a54bb8488b80f517168503d3c5d0ecd033445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589a54bb8488b80f517168503… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:37:25 2015 +0800 msvcp110: Add tr2_sys__File_size_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 14 +++++++++++--- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 17 ++++++++++++++++- 5 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index c5d438a..858af32 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1208,8 +1208,8 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt @ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) tr2_sys__File_size @ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) tr2_sys__File_size -@ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z -@ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z +@ cdecl -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z(wstr) tr2_sys__File_size_wchar +@ cdecl -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z(wstr) tr2_sys__File_size_wchar @ cdecl -arch=arm ?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr @ thiscall -arch=i386 ?_Findarr(a)ios_base@std@@AAEAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr @ cdecl -arch=win64 ?_Findarr(a)ios_base@std@@AEAAAEAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e9a7217..430690c 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1173,8 +1173,8 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt @ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) tr2_sys__File_size @ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) tr2_sys__File_size -@ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z -@ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z +@ cdecl -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z(wstr) tr2_sys__File_size_wchar +@ cdecl -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z(wstr) tr2_sys__File_size_wchar @ cdecl -arch=arm ?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr @ thiscall -arch=i386 ?_Findarr(a)ios_base@std@@AAEAAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr @ cdecl -arch=win64 ?_Findarr(a)ios_base@std@@AEAAAEAU_Iosarray(a)12@H(a)Z(ptr long) ios_base_Findarr diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 1a53bee..f2fdd92 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -73,6 +73,7 @@ static void (CDECL *p__Do_call)(void *this); /* filesystem */ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); +static ULONGLONG(__cdecl *p_tr2_sys__File_size_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Equivalent)(char const*, char const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); @@ -113,6 +114,8 @@ static BOOL init(void) if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z"); + SET(p_tr2_sys__File_size_wchar, + "?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); SET(p_tr2_sys__Current_get, @@ -136,6 +139,8 @@ static BOOL init(void) } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); + SET(p_tr2_sys__File_size_wchar, + "?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z"); SET(p_tr2_sys__Current_get, @@ -367,6 +372,7 @@ static void test_tr2_sys__File_size(void) ULONGLONG val; HANDLE file; LARGE_INTEGER file_size; + WCHAR testW[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; CreateDirectoryA("tr2_test_dir", NULL); file = CreateFileA("tr2_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); @@ -377,6 +383,8 @@ static void test_tr2_sys__File_size(void) CloseHandle(file); val = p_tr2_sys__File_size("tr2_test_dir/f1"); ok(val == 7, "file_size is %s\n", debugstr_longlong(val)); + val = p_tr2_sys__File_size_wchar(testW); + ok(val == 7, "file_size is %s\n", debugstr_longlong(val)); file = CreateFileA("tr2_test_dir/f2", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); @@ -397,9 +405,9 @@ static void test_tr2_sys__File_size(void) ok(val == 0, "file_size is %s\n", debugstr_longlong(val)); ok(errno == 0xdeadbeef, "errno = %d\n", errno); - ok(DeleteFileA("tr2_test_dir/f1"), "Expected tr2_test_dir/f1 to exist\n"); - ok(DeleteFileA("tr2_test_dir/f2"), "Expected tr2_test_dir/f2 to exist\n"); - ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); + ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); + ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n"); + ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); } static void test_tr2_sys__Equivalent(void) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 53dd548..04585c1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1173,8 +1173,8 @@ @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAPEADPEADDH(a)Z @ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) msvcp120.?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z @ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) msvcp120.?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z -@ stub -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z -@ stub -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z +@ cdecl -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z(wstr) msvcp120.?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z +@ cdecl -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z(wstr) msvcp120.?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z @ cdecl -arch=arm ?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z(ptr long) msvcp120.?_Findarr(a)ios_base@std@@AAAAAU_Iosarray(a)12@H(a)Z @ thiscall -arch=i386 ?_Findarr(a)ios_base@std@@AAEAAU_Iosarray(a)12@H(a)Z(ptr long) msvcp120.?_Findarr(a)ios_base@std@@AAEAAU_Iosarray(a)12@H(a)Z @ cdecl -arch=win64 ?_Findarr(a)ios_base@std@@AEAAAEAU_Iosarray(a)12@H(a)Z(ptr long) msvcp120.?_Findarr(a)ios_base@std@@AEAAAEAU_Iosarray(a)12@H(a)Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 006b787..49a3e4b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14204,7 +14204,7 @@ basic_ostream_char* __cdecl basic_ostream_char_print_complex_ldouble(basic_ostre /* ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z */ /* ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z */ -ULONGLONG __cdecl tr2_sys__File_size(const char* path) +ULONGLONG __cdecl tr2_sys__File_size(char const* path) { WIN32_FILE_ATTRIBUTE_DATA fad; @@ -14739,6 +14739,21 @@ void* __thiscall _Winit_ctor(void *this) return this; } +/* ?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z */ +/* ?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z */ +ULONGLONG __cdecl tr2_sys__File_size_wchar(WCHAR const* path) +{ + WIN32_FILE_ATTRIBUTE_DATA fad; + + TRACE("(%s)\n", debugstr_w(path)); + if(!GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) + return 0; + if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + return 0; + + return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

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

17 Aug '15

Module: wine Branch: master Commit: 70ac10affa98fcfd3a543abcf1c141c27e4fcff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ac10affa98fcfd3a543abcf… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:38:34 2015 +0800 msvcp110: Add tr2_sys__Equivalent_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 18 +++++++++++++++--- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 858af32..a245681 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1198,8 +1198,8 @@ @ cdecl -arch=win64 ?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ(ptr) _Yarn_wchar__Empty @ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Equivalent @ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Equivalent -@ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Equivalent_wchar +@ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Equivalent_wchar @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 430690c..a0357de 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1163,8 +1163,8 @@ @ cdecl -arch=win64 ?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ(ptr) _Yarn_wchar__Empty @ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Equivalent @ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Equivalent -@ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Equivalent_wchar +@ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Equivalent_wchar @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index f2fdd92..9fca0c2 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -75,6 +75,7 @@ static void (CDECL *p__Do_call)(void *this); static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*); static ULONGLONG(__cdecl *p_tr2_sys__File_size_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Equivalent)(char const*, char const*); +static int (__cdecl *p_tr2_sys__Equivalent_wchar)(WCHAR const*, WCHAR const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); @@ -118,6 +119,8 @@ static BOOL init(void) "?_File_size(a)sys@tr2(a)std@@YA_KPEB_W(a)Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); + SET(p_tr2_sys__Equivalent_wchar, + "?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z"); SET(p_tr2_sys__Current_get, "?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z"); SET(p_tr2_sys__Current_set, @@ -143,6 +146,8 @@ static BOOL init(void) "?_File_size(a)sys@tr2(a)std@@YA_KPB_W(a)Z"); SET(p_tr2_sys__Equivalent, "?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z"); + SET(p_tr2_sys__Equivalent_wchar, + "?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z"); SET(p_tr2_sys__Current_get, "?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z"); SET(p_tr2_sys__Current_set, @@ -415,6 +420,8 @@ static void test_tr2_sys__Equivalent(void) int val, i; HANDLE file; char temp_path[MAX_PATH], current_path[MAX_PATH]; + WCHAR testW[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; + WCHAR testW2[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','2',0}; struct { char const *path1; char const *path2; @@ -456,9 +463,14 @@ static void test_tr2_sys__Equivalent(void) ok(errno == 0xdeadbeef, "errno = %d\n", errno); } - ok(DeleteFileA("tr2_test_dir/f1"), "Expected tr2_test_dir/f1 to exist\n"); - ok(DeleteFileA("tr2_test_dir/f2"), "Expected tr2_test_dir/f2 to exist\n"); - ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); + val = p_tr2_sys__Equivalent_wchar(testW, testW); + ok(val == 1, "tr2_sys__Equivalent(): expect: 1, got %d\n", val); + val = p_tr2_sys__Equivalent_wchar(testW, testW2); + ok(val == 0, "tr2_sys__Equivalent(): expect: 0, got %d\n", val); + + ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); + ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n"); + ok(p_tr2_sys__Remove_dir("tr2_test_dir"), "expect tr2_test_dir to exist\n"); ok(SetCurrentDirectoryA(current_path), "SetCurrentDirectoryA failed\n"); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 04585c1..515ca2b 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1163,8 +1163,8 @@ @ cdecl -arch=win64 ?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ(ptr) msvcp120.?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ @ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) msvcp120.?_Equivalent(a)sys@tr2(a)std@@YAHPBD0(a)Z @ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) msvcp120.?_Equivalent(a)sys@tr2(a)std@@YAHPEBD0(a)Z -@ stub -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) msvcp120.?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z +@ cdecl -arch=win64 ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) msvcp120.?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) msvcp120.?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAPADPADDH(a)Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 49a3e4b..af3f569 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14754,6 +14754,42 @@ ULONGLONG __cdecl tr2_sys__File_size_wchar(WCHAR const* path) return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } +/* ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z */ +/* ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z */ +int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2) +{ + HANDLE h1, h2; + int ret; + BY_HANDLE_FILE_INFORMATION info1, info2; + TRACE("(%s %s)\n", debugstr_w(path1), debugstr_w(path2)); + + h1 = CreateFileW(path1, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + h2 = CreateFileW(path2, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + if(h1 == INVALID_HANDLE_VALUE) { + if(h2 == INVALID_HANDLE_VALUE) { + return -1; + }else { + CloseHandle(h2); + return 0; + } + }else if(h2 == INVALID_HANDLE_VALUE) { + CloseHandle(h1); + return 0; + } + + ret = GetFileInformationByHandle(h1, &info1) && GetFileInformationByHandle(h2, &info2); + CloseHandle(h1); + CloseHandle(h2); + if(!ret) + return -1; + return (info1.dwVolumeSerialNumber == info2.dwVolumeSerialNumber + && info1.nFileIndexHigh == info2.nFileIndexHigh + && info1.nFileIndexLow == info2.nFileIndexLow + ); +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

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

17 Aug '15

Module: wine Branch: master Commit: ee77fc3b4ec9152698fbb6c0e4784c6e28dddea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee77fc3b4ec9152698fbb6c0e… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:44:53 2015 +0800 msvcp110: Add tr2_sys__Current_get_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 15 +++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 11 +++++++++++ 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a245681..02d80f9 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1169,8 +1169,8 @@ @ stub -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z @ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPADPAD(a)Z(ptr) tr2_sys__Current_get @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEADPEAD(a)Z(ptr) tr2_sys__Current_get -@ stub -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WPA_W(a)Z -@ stub -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WPEA_W(a)Z +@ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WPA_W(a)Z(ptr) tr2_sys__Current_get_wchar +@ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WPEA_W(a)Z(ptr) tr2_sys__Current_get_wchar @ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Current_set @ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Current_set @ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a0357de..d431268 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1134,8 +1134,8 @@ @ stub -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z @ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z(ptr) tr2_sys__Current_get @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z(ptr) tr2_sys__Current_get -@ stub -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z -@ stub -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z +@ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z(ptr) tr2_sys__Current_get_wchar +@ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z(ptr) tr2_sys__Current_get_wchar @ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Current_set @ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Current_set @ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 9fca0c2..a81c928 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -77,6 +77,7 @@ static ULONGLONG(__cdecl *p_tr2_sys__File_size_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Equivalent)(char const*, char const*); static int (__cdecl *p_tr2_sys__Equivalent_wchar)(WCHAR const*, WCHAR const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); +static WCHAR* (__cdecl *p_tr2_sys__Current_get_wchar)(WCHAR *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); @@ -123,6 +124,8 @@ static BOOL init(void) "?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z"); SET(p_tr2_sys__Current_get, "?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z"); + SET(p_tr2_sys__Current_get_wchar, + "?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z"); SET(p_tr2_sys__Current_set, "?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z"); SET(p_tr2_sys__Make_dir, @@ -150,6 +153,8 @@ static BOOL init(void) "?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z"); SET(p_tr2_sys__Current_get, "?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z"); + SET(p_tr2_sys__Current_get_wchar, + "?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z"); SET(p_tr2_sys__Current_set, "?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z"); SET(p_tr2_sys__Make_dir, @@ -478,6 +483,8 @@ static void test_tr2_sys__Current_get(void) { char temp_path[MAX_PATH], current_path[MAX_PATH], origin_path[MAX_PATH]; char *temp; + WCHAR temp_path_wchar[MAX_PATH], current_path_wchar[MAX_PATH]; + WCHAR *temp_wchar; memset(origin_path, 0, MAX_PATH); GetCurrentDirectoryA(MAX_PATH, origin_path); memset(temp_path, 0, MAX_PATH); @@ -490,6 +497,14 @@ static void test_tr2_sys__Current_get(void) temp[strlen(temp)] = '\\'; ok(!strcmp(temp_path, current_path), "test_tr2_sys__Current_get(): expect: %s, got %s\n", temp_path, current_path); + GetTempPathW(MAX_PATH, temp_path_wchar); + ok(SetCurrentDirectoryW(temp_path_wchar), "SetCurrentDirectoryW to temp_path_wchar failed\n"); + memset(current_path_wchar, 0, MAX_PATH); + temp_wchar = p_tr2_sys__Current_get_wchar(current_path_wchar); + ok(temp_wchar == current_path_wchar, "p_tr2_sys__Current_get_wchar returned different buffer\n"); + temp_wchar[wcslen(temp_wchar)] = '\\'; + ok(!wcscmp(temp_path_wchar, current_path_wchar), "test_tr2_sys__Current_get(): expect: %s, got %s\n", wine_dbgstr_w(temp_path_wchar), wine_dbgstr_w(current_path_wchar)); + ok(SetCurrentDirectoryA(origin_path), "SetCurrentDirectoryA to origin_path failed\n"); memset(current_path, 0, MAX_PATH); temp = p_tr2_sys__Current_get(current_path); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 515ca2b..286b978 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1134,8 +1134,8 @@ @ stub -arch=win64 ?_Copy_file(a)sys@tr2(a)std@@YAHPEB_W0_N(a)Z @ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z(ptr) msvcp120.?_Current_get(a)sys@tr2(a)std@@YAPADAAY0BAE(a)D@Z @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z(ptr) msvcp120.?_Current_get(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)D@Z -@ stub -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z -@ stub -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z +@ cdecl -arch=win32 ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z(ptr) msvcp120.?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z +@ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z(ptr) msvcp120.?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z @ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) msvcp120.?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z @ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) msvcp120.?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z @ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index af3f569..9056972 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14790,6 +14790,17 @@ int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2) ); } +/* ?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z */ +/* ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z */ +WCHAR* __cdecl tr2_sys__Current_get_wchar(WCHAR *current_path) +{ + TRACE("(%s)\n", debugstr_w(current_path)); + + if(!GetCurrentDirectoryW(MAX_PATH, current_path)) + return NULL; + return current_path; +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

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

17 Aug '15

Module: wine Branch: master Commit: e55149f8ae6cec76bf910e9e3e37b0457357394a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55149f8ae6cec76bf910e9e3… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:45:28 2015 +0800 msvcp110: Add tr2_sys__Current_set_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 8 +++++++- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 8 ++++++++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 02d80f9..ff513b3 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1173,8 +1173,8 @@ @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WPEA_W(a)Z(ptr) tr2_sys__Current_get_wchar @ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Current_set @ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Current_set -@ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z -@ stub -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z +@ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z(wstr) tr2_sys__Current_set_wchar +@ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z(wstr) tr2_sys__Current_set_wchar @ cdecl -arch=arm ?_Decref(a)facet@locale(a)std@@UAAPAV_Facet_base(a)3@XZ(ptr) locale_facet__Decref @ thiscall -arch=i386 ?_Decref(a)facet@locale(a)std@@UAEPAV_Facet_base(a)3@XZ(ptr) locale_facet__Decref @ cdecl -arch=win64 ?_Decref(a)facet@locale(a)std@@UEAAPEAV_Facet_base(a)3@XZ(ptr) locale_facet__Decref diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index d431268..8348a3f 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1138,8 +1138,8 @@ @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z(ptr) tr2_sys__Current_get_wchar @ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Current_set @ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Current_set -@ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z -@ stub -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z +@ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z(wstr) tr2_sys__Current_set_wchar +@ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z(wstr) tr2_sys__Current_set_wchar @ cdecl -arch=arm ?_Decref(a)facet@locale(a)std@@UAAPAV_Facet_base(a)3@XZ(ptr) locale_facet__Decref @ thiscall -arch=i386 ?_Decref(a)facet@locale(a)std@@UAEPAV_Facet_base(a)3@XZ(ptr) locale_facet__Decref @ cdecl -arch=win64 ?_Decref(a)facet@locale(a)std@@UEAAPEAV_Facet_base(a)3@XZ(ptr) locale_facet__Decref diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index a81c928..07277b3 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -79,6 +79,7 @@ static int (__cdecl *p_tr2_sys__Equivalent_wchar)(WCHAR const*, WCHAR const*); static char* (__cdecl *p_tr2_sys__Current_get)(char *); static WCHAR* (__cdecl *p_tr2_sys__Current_get_wchar)(WCHAR *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); +static MSVCP_bool (__cdecl *p_tr2_sys__Current_set_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); static int (__cdecl *p_tr2_sys__Copy_file)(char const*, char const*, MSVCP_bool); @@ -128,6 +129,8 @@ static BOOL init(void) "?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z"); SET(p_tr2_sys__Current_set, "?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z"); + SET(p_tr2_sys__Current_set_wchar, + "?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z"); SET(p_tr2_sys__Remove_dir, @@ -157,6 +160,8 @@ static BOOL init(void) "?_Current_get(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_W@Z"); SET(p_tr2_sys__Current_set, "?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z"); + SET(p_tr2_sys__Current_set_wchar, + "?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z"); SET(p_tr2_sys__Remove_dir, @@ -516,6 +521,7 @@ static void test_tr2_sys__Current_set(void) { char temp_path[MAX_PATH], current_path[MAX_PATH], origin_path[MAX_PATH]; char *temp; + WCHAR testW[] = {'.','/',0}; memset(temp_path, 0, MAX_PATH); GetTempPathA(MAX_PATH, temp_path); memset(origin_path, 0, MAX_PATH); @@ -530,7 +536,7 @@ static void test_tr2_sys__Current_set(void) temp[strlen(temp)] = '\\'; ok(!strcmp(temp_path, current_path), "test_tr2_sys__Current_get(): expect: %s, got %s\n", temp_path, current_path); - ok(p_tr2_sys__Current_set("./"), "p_tr2_sys__Current_set to temp_path failed\n"); + ok(p_tr2_sys__Current_set_wchar(testW), "p_tr2_sys__Current_set_wchar to temp_path failed\n"); memset(current_path, 0, MAX_PATH); temp = p_tr2_sys__Current_get(current_path); ok(temp == current_path, "p_tr2_sys__Current_get returned different buffer\n"); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 286b978..697c83c 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1138,8 +1138,8 @@ @ cdecl -arch=win64 ?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z(ptr) msvcp120.?_Current_get(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_W@Z @ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) msvcp120.?_Current_set(a)sys@tr2(a)std@@YA_NPBD(a)Z @ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) msvcp120.?_Current_set(a)sys@tr2(a)std@@YA_NPEBD(a)Z -@ stub -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z -@ stub -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z +@ cdecl -arch=win32 ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z(wstr) msvcp120.?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z +@ cdecl -arch=win64 ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z(wstr) msvcp120.?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z @ cdecl -arch=arm ?_Decref(a)facet@locale(a)std@@UAAPAV_Facet_base(a)3@XZ(ptr) msvcp120.?_Decref(a)facet@locale(a)std@@UAAPAV_Facet_base(a)3@XZ @ thiscall -arch=i386 ?_Decref(a)facet@locale(a)std@@UAEPAV_Facet_base(a)3@XZ(ptr) msvcp120.?_Decref(a)facet@locale(a)std@@UAEPAV_Facet_base(a)3@XZ @ cdecl -arch=win64 ?_Decref(a)facet@locale(a)std@@UEAAPEAV_Facet_base(a)3@XZ(ptr) msvcp120.?_Decref(a)facet@locale(a)std@@UEAAPEAV_Facet_base(a)3@XZ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9056972..458e6de 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14801,6 +14801,14 @@ WCHAR* __cdecl tr2_sys__Current_get_wchar(WCHAR *current_path) return current_path; } +/* ?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z */ +/* ?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z */ +MSVCP_bool __cdecl tr2_sys__Current_set_wchar(WCHAR const* path) +{ + TRACE("(%s)\n", debugstr_w(path)); + return SetCurrentDirectoryW(path) != 0; +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

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

17 Aug '15

Module: wine Branch: master Commit: 2b19569958f5b00fe3e60ccf29dfce88dc28033a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b19569958f5b00fe3e60ccf2… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:45:57 2015 +0800 msvcp110: Add tr2_sys__Make_dir_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 11 ++++++++++- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 16 ++++++++++++++++ 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index ff513b3..c1c6212 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1619,8 +1619,8 @@ @ stub -arch=win64 ?_MP_Rem(a)std@@YAXQEA_K_K(a)Z @ cdecl -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Make_dir @ cdecl -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Make_dir -@ stub -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) tr2_sys__Make_dir_wchar +@ cdecl -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) tr2_sys__Make_dir_wchar @ cdecl -arch=win32 ?_Makeloc(a)_Locimp@locale(a)std@@CAPAV123(a)ABV_Locinfo@3(a)HPAV123@PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc @ cdecl -arch=win64 ?_Makeloc(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV_Locinfo@3(a)HPEAV123@PEBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc @ cdecl -arch=win32 ?_Makeushloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeushloc diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 8348a3f..e990eaf 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1580,8 +1580,8 @@ @ stub -arch=win64 ?_MP_Rem(a)std@@YAXQEA_K_K(a)Z @ cdecl -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Make_dir @ cdecl -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Make_dir -@ stub -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) tr2_sys__Make_dir_wchar +@ cdecl -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) tr2_sys__Make_dir_wchar @ cdecl -arch=win32 ?_Makeloc(a)_Locimp@locale(a)std@@CAPAV123(a)ABV_Locinfo@3(a)HPAV123@PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc @ cdecl -arch=win64 ?_Makeloc(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV_Locinfo@3(a)HPEAV123@PEBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc @ cdecl -arch=win32 ?_Makeushloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeushloc diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 07277b3..85e9354 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -81,6 +81,7 @@ static WCHAR* (__cdecl *p_tr2_sys__Current_get_wchar)(WCHAR *); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set)(char const*); static MSVCP_bool (__cdecl *p_tr2_sys__Current_set_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); +static int (__cdecl *p_tr2_sys__Make_dir_wchar)(WCHAR const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); static int (__cdecl *p_tr2_sys__Copy_file)(char const*, char const*, MSVCP_bool); static int (__cdecl *p_tr2_sys__Rename)(char const*, char const*); @@ -133,6 +134,8 @@ static BOOL init(void) "?_Current_set(a)sys@tr2(a)std@@YA_NPEB_W(a)Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z"); + SET(p_tr2_sys__Make_dir_wchar, + "?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z"); SET(p_tr2_sys__Remove_dir, "?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z"); SET(p_tr2_sys__Copy_file, @@ -164,6 +167,8 @@ static BOOL init(void) "?_Current_set(a)sys@tr2(a)std@@YA_NPB_W(a)Z"); SET(p_tr2_sys__Make_dir, "?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z"); + SET(p_tr2_sys__Make_dir_wchar, + "?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z"); SET(p_tr2_sys__Remove_dir, "?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z"); SET(p_tr2_sys__Copy_file, @@ -561,6 +566,7 @@ static void test_tr2_sys__Current_set(void) static void test_tr2_sys__Make_dir(void) { int ret, i; + WCHAR testW[] = {'w','d',0}; struct { char const *path; int val; @@ -577,8 +583,11 @@ static void test_tr2_sys__Make_dir(void) ok(ret == tests[i].val, "tr2_sys__Make_dir(): test %d expect: %d, got %d\n", i+1, tests[i].val, ret); ok(errno == 0xdeadbeef, "tr2_sys__Make_dir(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); } + ret = p_tr2_sys__Make_dir_wchar(testW); + ok(ret == 1, "tr2_sys__Make_dir(): expect: 1, got %d\n", ret); - ok(RemoveDirectoryA("tr2_test_dir"), "Expected tr2_test_dir to exist\n"); + ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); + ok(RemoveDirectoryW(testW), "expect wd to exist\n"); } static void test_tr2_sys__Remove_dir(void) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 697c83c..b20d507 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1580,8 +1580,8 @@ @ stub -arch=win64 ?_MP_Rem(a)std@@YAXQEA_K_K(a)Z @ cdecl -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z(str) msvcp120.?_Make_dir(a)sys@tr2(a)std@@YAHPBD(a)Z @ cdecl -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) msvcp120.?_Make_dir(a)sys@tr2(a)std@@YAHPEBD(a)Z -@ stub -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) msvcp120.?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z +@ cdecl -arch=win64 ?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) msvcp120.?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=win32 ?_Makeloc(a)_Locimp@locale(a)std@@CAPAV123(a)ABV_Locinfo@3(a)HPAV123@PBV23@@Z(ptr long ptr ptr) msvcp120.?_Makeloc(a)_Locimp@locale(a)std@@CAPAV123(a)ABV_Locinfo@3(a)HPAV123@PBV23@@Z @ cdecl -arch=win64 ?_Makeloc(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV_Locinfo@3(a)HPEAV123@PEBV23@@Z(ptr long ptr ptr) msvcp120.?_Makeloc(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV_Locinfo@3(a)HPEAV123@PEBV23@@Z @ cdecl -arch=win32 ?_Makeushloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z(ptr long ptr ptr) msvcp120.?_Makeushloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 458e6de..c01d187 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14809,6 +14809,22 @@ MSVCP_bool __cdecl tr2_sys__Current_set_wchar(WCHAR const* path) return SetCurrentDirectoryW(path) != 0; } +/* ?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z */ +/* ?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z */ +int __cdecl tr2_sys__Make_dir_wchar(WCHAR const* path) +{ + TRACE("(%s)\n", debugstr_w(path)); + + if(!CreateDirectoryW(path, NULL)) { + if(GetLastError() == ERROR_ALREADY_EXISTS) + return 0; + else + return -1; + } + + return 1; +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

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

17 Aug '15

Module: wine Branch: master Commit: 5b07326368816581c4adf478569f398366fc270a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b07326368816581c4adf4785… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Mon Aug 10 14:46:32 2015 +0800 msvcp110: Add tr2_sys__Remove_dir_wchar implementation and test. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 11 ++++++++--- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 8 ++++++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index c1c6212..fb22ca1 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1720,8 +1720,8 @@ @ stub -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ @ cdecl -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Remove_dir @ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Remove_dir -@ stub -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z -@ stub -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z +@ cdecl -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z(wstr) tr2_sys__Remove_dir_wchar +@ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z(wstr) tr2_sys__Remove_dir_wchar @ cdecl -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Rename @ cdecl -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Rename @ stub -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e990eaf..8a7b6d7 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1681,8 +1681,8 @@ @ stub -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ @ cdecl -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) tr2_sys__Remove_dir @ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) tr2_sys__Remove_dir -@ stub -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z -@ stub -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z +@ cdecl -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z(wstr) tr2_sys__Remove_dir_wchar +@ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z(wstr) tr2_sys__Remove_dir_wchar @ cdecl -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Rename @ cdecl -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Rename @ stub -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 85e9354..6bbe11e 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -83,6 +83,7 @@ static MSVCP_bool (__cdecl *p_tr2_sys__Current_set_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Make_dir)(char const*); static int (__cdecl *p_tr2_sys__Make_dir_wchar)(WCHAR const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); +static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir_wchar)(WCHAR const*); static int (__cdecl *p_tr2_sys__Copy_file)(char const*, char const*, MSVCP_bool); static int (__cdecl *p_tr2_sys__Rename)(char const*, char const*); static struct space_info (__cdecl *p_tr2_sys__Statvfs)(char const*); @@ -138,6 +139,8 @@ static BOOL init(void) "?_Make_dir(a)sys@tr2(a)std@@YAHPEB_W(a)Z"); SET(p_tr2_sys__Remove_dir, "?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z"); + SET(p_tr2_sys__Remove_dir_wchar, + "?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z"); SET(p_tr2_sys__Copy_file, "?_Copy_file(a)sys@tr2(a)std@@YAHPEBD0_N(a)Z"); SET(p_tr2_sys__Rename, @@ -171,6 +174,8 @@ static BOOL init(void) "?_Make_dir(a)sys@tr2(a)std@@YAHPB_W(a)Z"); SET(p_tr2_sys__Remove_dir, "?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z"); + SET(p_tr2_sys__Remove_dir_wchar, + "?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z"); SET(p_tr2_sys__Copy_file, "?_Copy_file(a)sys@tr2(a)std@@YAHPBD0_N(a)Z"); SET(p_tr2_sys__Rename, @@ -427,7 +432,7 @@ static void test_tr2_sys__File_size(void) ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); ok(DeleteFileA("tr2_test_dir/f2"), "expect tr2_test_dir/f2 to exist\n"); - ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); + ok(p_tr2_sys__Remove_dir("tr2_test_dir"), "expect tr2_test_dir to exist\n"); } static void test_tr2_sys__Equivalent(void) @@ -586,8 +591,8 @@ static void test_tr2_sys__Make_dir(void) ret = p_tr2_sys__Make_dir_wchar(testW); ok(ret == 1, "tr2_sys__Make_dir(): expect: 1, got %d\n", ret); - ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); - ok(RemoveDirectoryW(testW), "expect wd to exist\n"); + ok(p_tr2_sys__Remove_dir("tr2_test_dir"), "expect tr2_test_dir to exist\n"); + ok(p_tr2_sys__Remove_dir_wchar(testW), "expect wd to exist\n"); } static void test_tr2_sys__Remove_dir(void) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index b20d507..d05b3d4 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1681,8 +1681,8 @@ @ stub -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ @ cdecl -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z(str) msvcp120.?_Remove_dir(a)sys@tr2(a)std@@YA_NPBD(a)Z @ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z(str) msvcp120.?_Remove_dir(a)sys@tr2(a)std@@YA_NPEBD(a)Z -@ stub -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z -@ stub -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z +@ cdecl -arch=win32 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z(wstr) msvcp120.?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z +@ cdecl -arch=win64 ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z(wstr) msvcp120.?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z @ cdecl -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) msvcp120.?_Rename(a)sys@tr2(a)std@@YAHPBD0(a)Z @ cdecl -arch=win64 ?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) msvcp120.?_Rename(a)sys@tr2(a)std@@YAHPEBD0(a)Z @ stub -arch=win32 ?_Rename(a)sys@tr2(a)std@@YAHPB_W0(a)Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c01d187..88d6453 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14825,6 +14825,14 @@ int __cdecl tr2_sys__Make_dir_wchar(WCHAR const* path) return 1; } +/* ?_Remove_dir(a)sys@tr2(a)std@@YA_NPB_W(a)Z */ +/* ?_Remove_dir(a)sys@tr2(a)std@@YA_NPEB_W(a)Z */ +MSVCP_bool __cdecl tr2_sys__Remove_dir_wchar(WCHAR const* path) +{ + TRACE("(%s)\n", debugstr_w(path)); + return RemoveDirectoryW(path) != 0; +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0