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

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

17 Aug '15

Module: wine Branch: master Commit: 3ad5a07856e8fb9a99e5be78b400c09966e28e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad5a07856e8fb9a99e5be78b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 14:08:23 2015 +0200 vcomp: Add ARM support. --- dlls/vcomp/main.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 10ac465..8143020 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -189,6 +189,42 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") +#elif defined(__arm__) + +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +__ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, + ".arm\n\t" + "push {r4, r5, LR}\n\t" + "mov r4, r0\n\t" + "mov r5, SP\n\t" + "lsl r3, r1, #2\n\t" + "cmp r3, #0\n\t" + "beq 5f\n\t" + "sub SP, SP, r3\n\t" + "tst r1, #1\n\t" + "subeq SP, SP, #4\n\t" + "1:\tsub r3, r3, #4\n\t" + "ldr r0, [r2, r3]\n\t" + "str r0, [SP, r3]\n\t" + "cmp r3, #0\n\t" + "bgt 1b\n\t" + "cmp r1, #1\n\t" + "bgt 2f\n\t" + "pop {r0}\n\t" + "b 5f\n\t" + "2:\tcmp r1, #2\n\t" + "bgt 3f\n\t" + "pop {r0-r1}\n\t" + "b 5f\n\t" + "3:\tcmp r1, #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 static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args)

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

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

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

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(a)filebuf@@2HB */ const int filebuf_openprot = 420; /* ?binary(a)filebuf@@2HB */ -const int filebuf_binary = 0x8000; +const int filebuf_binary = _O_BINARY; /* ?text(a)filebuf@@2HB */ -const int filebuf_text = 0x4000; +const int filebuf_text = _O_TEXT; /* ?adjustfield(a)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(a)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(a)filebuf@@QEAAPEAV1(a)H@Z"); SET(p_filebuf_open, "?open(a)filebuf@@QEAAPEAV1(a)PEBDHH@Z"); SET(p_filebuf_close, "?close(a)filebuf@@QEAAPEAV1(a)XZ"); + SET(p_filebuf_setmode, "?setmode(a)filebuf@@QEAAHH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -350,6 +355,7 @@ static BOOL init(void) SET(p_filebuf_attach, "?attach(a)filebuf@@QAEPAV1(a)H@Z"); SET(p_filebuf_open, "?open(a)filebuf@@QAEPAV1(a)PBDHH@Z"); SET(p_filebuf_close, "?close(a)filebuf@@QAEPAV1(a)XZ"); + SET(p_filebuf_setmode, "?setmode(a)filebuf@@QAEHH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)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: 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(a)filebuf@@QAEHH(a)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(a)filebuf@@QEAAPEAV1(a)PEBDHH@Z"); SET(p_filebuf_close, "?close(a)filebuf@@QEAAPEAV1(a)XZ"); SET(p_filebuf_setmode, "?setmode(a)filebuf@@QEAAHH(a)Z"); + SET(p_filebuf_setbuf, "?setbuf(a)filebuf@@UEAAPEAVstreambuf@@PEADH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -356,6 +358,7 @@ static BOOL init(void) SET(p_filebuf_open, "?open(a)filebuf@@QAEPAV1(a)PBDHH@Z"); SET(p_filebuf_close, "?close(a)filebuf@@QAEPAV1(a)XZ"); SET(p_filebuf_setmode, "?setmode(a)filebuf@@QAEHH(a)Z"); + SET(p_filebuf_setbuf, "?setbuf(a)filebuf@@UAEPAVstreambuf@@PADH(a)Z"); SET(p_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)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::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(a)filebuf@@QEAAPEAV1(a)XZ"); 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_ios_copy_ctor, "??0ios@@IEAA(a)AEBV0@@Z"); SET(p_ios_ctor, "??0ios@@IEAA(a)XZ"); @@ -359,6 +361,7 @@ static BOOL init(void) SET(p_filebuf_close, "?close(a)filebuf@@QAEPAV1(a)XZ"); 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_ios_copy_ctor, "??0ios@@IAE(a)ABV0@@Z"); SET(p_ios_ctor, "??0ios@@IAE(a)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

Zhenbo Li : mshtml: Add IHTMLSelectElement::name property implementation.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: f7b9dd9525e1643097f60296874a70e4f77e1741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b9dd9525e1643097f602968… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 8 11:14:21 2015 +0800 mshtml: Add IHTMLSelectElement::name property implementation. --- dlls/mshtml/htmlselect.c | 35 ++++++++++++++--------------------- dlls/mshtml/tests/dom.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index e55d7ea..899c8e5 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -205,40 +205,33 @@ static HRESULT WINAPI HTMLSelectElement_get_multiple(IHTMLSelectElement *iface, static HRESULT WINAPI HTMLSelectElement_put_name(IHTMLSelectElement *iface, BSTR v) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + nsAString_InitDepend(&str, v); + nsres = nsIDOMHTMLSelectElement_SetName(This->nsselect, &str); + nsAString_Finish(&str); + + if(NS_FAILED(nsres)) { + ERR("SetName failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_name(IHTMLSelectElement *iface, BSTR *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); nsAString name_str; - const PRUnichar *name = NULL; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&name_str, NULL); - nsres = nsIDOMHTMLSelectElement_GetName(This->nsselect, &name_str); - if(NS_SUCCEEDED(nsres)) { - static const WCHAR wszGarbage[] = {'g','a','r','b','a','g','e',0}; - - nsAString_GetData(&name_str, &name); - - /* - * Native never returns empty string here. If an element has no name, - * name of previous element or ramdom data is returned. - */ - *p = SysAllocString(*name ? name : wszGarbage); - }else { - ERR("GetName failed: %08x\n", nsres); - } - nsAString_Finish(&name_str); - - TRACE("name=%s\n", debugstr_w(*p)); - return S_OK; + return return_nsstr(nsres, &name_str, p); } static HRESULT WINAPI HTMLSelectElement_get_options(IHTMLSelectElement *iface, IDispatch **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7088c52..fff65d8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2217,6 +2217,37 @@ static void _test_select_set_size(unsigned line, IHTMLSelectElement *select, LON ok_(__FILE__,line) (hres == exhres, "put_size(%d) got %08x, expect %08x\n", val, hres, exhres); } +#define test_select_name(s,v) _test_select_name(__LINE__,s,v) +static void _test_select_name(unsigned line, IHTMLSelectElement *select, const char *extext) +{ + HRESULT hres; + BSTR text; + + text = NULL; + hres = IHTMLSelectElement_get_name(select, &text); + ok_(__FILE__,line) (hres == S_OK, "get_name failed: %08x\n", hres); + if(extext) { + ok_(__FILE__,line) (text != NULL, "text == NULL\n"); + ok_(__FILE__,line) (!strcmp_wa(text, extext), "name = %s, expected %s\n", + wine_dbgstr_w(text), extext); + SysFreeString(text); + } else + ok_(__FILE__,line) (text == NULL, "text(%p) = %s\n", text, wine_dbgstr_w(text)); +} + +#define test_select_set_name(s,v) _test_select_set_name(__LINE__,s,v) +static void _test_select_set_name(unsigned line, IHTMLSelectElement *select, const char *text) +{ + HRESULT hres; + BSTR bstr; + + bstr = a2bstr(text); + + hres = IHTMLSelectElement_put_name(select, bstr); + ok_(__FILE__,line) (hres == S_OK, "put_name(%s) failed: %08x\n", wine_dbgstr_w(bstr), hres); + SysFreeString(bstr); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -4914,6 +4945,10 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_set_size(select, 3, S_OK); test_select_size(select, 3); + test_select_name(select, NULL); + test_select_set_name(select, "select-name"); + test_select_name(select, "select-name"); + test_select_get_disabled(select, VARIANT_FALSE); test_select_set_disabled(select, VARIANT_TRUE); test_select_set_disabled(select, VARIANT_FALSE);

1 0

Zhenbo Li : mshtml: Add IHTMLSelectElement::form property implementation.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: a15751ab7371efc5c27e208916ff5402df5c17a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15751ab7371efc5c27e20891… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 8 11:14:47 2015 +0800 mshtml: Add IHTMLSelectElement::form property implementation. --- dlls/mshtml/htmlselect.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 899c8e5..3c869ff 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -371,8 +371,43 @@ static HRESULT WINAPI HTMLSelectElement_get_disabled(IHTMLSelectElement *iface, static HRESULT WINAPI HTMLSelectElement_get_form(IHTMLSelectElement *iface, IHTMLFormElement **p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLFormElement *nsform; + nsIDOMNode *form_node; + HTMLDOMNode *node; + HRESULT hres; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + nsres = nsIDOMHTMLSelectElement_GetForm(This->nsselect, &nsform); + FIXME("get form %08x : %p\n", nsres, nsform); + if (NS_FAILED(nsres)) { + ERR("GetForm failed: %08x, nsform: %p\n", nsres, nsform); + *p = NULL; + return E_FAIL; + } + if (nsform == NULL) { + TRACE("nsform not found\n"); + *p = NULL; + return S_OK; + } + + nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); + nsIDOMHTMLFormElement_Release(nsform); + assert(nsres == NS_OK); + + hres = get_node(This->element.node.doc, form_node, TRUE, &node); + nsIDOMNode_Release(form_node); + if (FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); + + node_release(node); + return hres; } static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElement *element, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fff65d8..3f68d87 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4313,6 +4313,40 @@ static void test_form_target(IUnknown *unk) IHTMLFormElement_Release(form); } +static void test_select_form(IUnknown *uselect, IUnknown *uform) +{ + IHTMLSelectElement *select = get_select_iface(uselect); + IHTMLFormElement *form; + HRESULT hres; + + hres = IHTMLSelectElement_get_form(select, NULL); + ok(hres == E_POINTER, "got %08x\n, expected E_POINTER\n", hres); + + hres = IHTMLSelectElement_get_form(select, &form); + ok(hres == S_OK, "get_form failed: %08x\n", hres); + ok(form != NULL, "form == NULL\n"); + + test_form_length((IUnknown*)form, 1); + test_form_elements((IUnknown*)form); + test_form_name((IUnknown*)form, "form_name"); + + ok(iface_cmp(uform, (IUnknown*)form), "Expected %p, got %p\n", uform, form); + + IHTMLSelectElement_Release(select); + IHTMLFormElement_Release(form); +} + +static void test_select_form_notfound(IHTMLSelectElement *select) +{ + IHTMLFormElement *form; + HRESULT hres; + + form = (IHTMLFormElement*)0xdeadbeef; + hres = IHTMLSelectElement_get_form(select, &form); + ok(hres == S_OK, "get_form failed: %08x\n", hres); + ok(form == NULL, "got %p\n", form); +} + #define test_meta_name(a,b) _test_meta_name(__LINE__,a,b) static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) { @@ -4948,6 +4982,7 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_name(select, NULL); test_select_set_name(select, "select-name"); test_select_name(select, "select-name"); + test_select_form_notfound(select); test_select_get_disabled(select, VARIANT_FALSE); test_select_set_disabled(select, VARIANT_TRUE); @@ -8491,6 +8526,16 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_elem_set_innerhtml((IUnknown*)div, + "<form id=\"form\" name=\"form_name\"><select id=\"sform\"></select></form>"); + elem = get_elem_by_id(doc, "sform", TRUE); + elem2 = get_elem_by_id(doc, "form", TRUE); + if(elem && elem2) { + test_select_form((IUnknown*)elem, (IUnknown*)elem2); + IHTMLElement_Release(elem); + IHTMLElement_Release(elem2); + } + test_attr(div); test_blocked(doc, div); test_elem_names(doc);

1 0

Indrek Altpere : mshtml: Handle nsIDOMWindow_GetFrames returning NULL.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 2cfe3cac0ce15e97b1b3fe374ad6f3d8da4075e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cfe3cac0ce15e97b1b3fe374… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Sun Aug 9 09:24:04 2015 +0300 mshtml: Handle nsIDOMWindow_GetFrames returning NULL. --- dlls/mshtml/htmlwindow.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b5b906a..280a5d7 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -380,6 +380,11 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H return E_FAIL; } + if(!nsframes) { + WARN("nsIDOMWindow_GetFrames returned NULL nsframes: %p\n", This->nswindow); + return DISP_E_MEMBERNOTFOUND; + } + nsAString_InitDepend(&name_str, name); nsres = nsIDOMWindowCollection_NamedItem(nsframes, &name_str, &nswindow); nsAString_Finish(&name_str);

1 0