June 2016 - Wine-Commits - list.winehq.org

Iván Matellanes : msvcirt: Implement ostream::opfx.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 327cada0f1b81a3fd55f1a9047317ded2c6b149c URL: http://source.winehq.org/git/wine.git/?a=commit;h=327cada0f1b81a3fd55f1a904… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:18 2016 +0100 msvcirt: Implement ostream::opfx. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 2d9c235..54012c0 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2406,8 +2406,19 @@ ostream* __thiscall ostream_flush(ostream *this) DEFINE_THISCALL_WRAPPER(ostream_opfx, 4) int __thiscall ostream_opfx(ostream *this) { - FIXME("(%p) stub\n", this); - return 0; + ios *base = ostream_get_ios(this); + + TRACE("(%p)\n", this); + + if (!ios_good(base)) { + ios_clear(base, base->state | IOSTATE_failbit); + return 0; + } + ios_lock(base); + ios_lockbuf(base); + if (base->tie) + ostream_flush(base->tie); + return 1; } /* ?osfx(a)ostream@@QAEXXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 045c224..7197126 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -262,6 +262,7 @@ static ostream* (*__thiscall p_ostream_assign)(ostream*, const ostream*); static ostream* (*__thiscall p_ostream_assign_sb)(ostream*, streambuf*); static void (*__thiscall p_ostream_vbase_dtor)(ostream*); static ostream* (*__thiscall p_ostream_flush)(ostream*); +static int (*__thiscall p_ostream_opfx)(ostream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -428,6 +429,7 @@ static BOOL init(void) SET(p_ostream_assign_sb, "??4ostream@@IEAAAEAV0(a)PEAVstreambuf@@@Z"); SET(p_ostream_vbase_dtor, "??_Dostream@@QEAAXXZ"); SET(p_ostream_flush, "?flush(a)ostream@@QEAAAEAV1(a)XZ"); + SET(p_ostream_opfx, "?opfx(a)ostream@@QEAAHXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -524,6 +526,7 @@ static BOOL init(void) SET(p_ostream_assign_sb, "??4ostream@@IAEAAV0(a)PAVstreambuf@@@Z"); SET(p_ostream_vbase_dtor, "??_Dostream@@QAEXXZ"); SET(p_ostream_flush, "?flush(a)ostream@@QAEAAV1(a)XZ"); + SET(p_ostream_opfx, "?opfx(a)ostream@@QAEHXZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -2666,6 +2669,44 @@ if (0) /* crashes on native */ ok(fb2.base.pbase == fb2.base.base, "wrong put base, expected %p got %p\n", fb2.base.base, fb2.base.pbase); ok(fb2.base.pptr == fb2.base.base + 12, "wrong put pointer, expected %p got %p\n", fb2.base.base + 12, fb2.base.pptr); + /* opfx */ + ret = (int) call_func1(p_ostream_opfx, &os1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(os1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, os1.base_ios.state); + os1.base_ios.state = IOSTATE_badbit; + ret = (int) call_func1(p_ostream_opfx, &os1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + os1.base_ios.sb = (streambuf*) &fb1; + os1.base_ios.state = IOSTATE_badbit; + ret = (int) call_func1(p_ostream_opfx, &os1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + os1.base_ios.state = IOSTATE_failbit; + ret = (int) call_func1(p_ostream_opfx, &os1); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(os1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, os1.base_ios.state); + os1.base_ios.state = IOSTATE_goodbit; + os1.base_ios.tie = &os2; + os2.base_ios.sb = NULL; +if (0) /* crashes on native */ + ret = (int) call_func1(p_ostream_opfx, &os1); + os2.base_ios.sb = (streambuf*) &fb2; + os2.base_ios.state = IOSTATE_badbit; + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "We've known each other", 22); + ok(ret == 22, "expected 22 got %d\n", ret); + ret = (int) call_func1(p_ostream_opfx, &os1); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(os1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, os1.base_ios.state); + ok(os2.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, os2.base_ios.state); + 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 + 22, "wrong put pointer, expected %p got %p\n", fb1.base.base + 22, fb1.base.pptr); + ok(fb2.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb2.base.pbase); + ok(fb2.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb2.base.pptr); + call_func1(p_ostream_vbase_dtor, &os1); call_func1(p_ostream_vbase_dtor, &os2); call_func1(p_filebuf_dtor, &fb1);

1 0

Iván Matellanes : msvcirt: Implement ostream::flush.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 6fedfa6128e548a7280a2507ed22efa1df7fe3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fedfa6128e548a7280a2507e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:17 2016 +0100 msvcirt: Implement ostream::flush. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 9 ++++++++- dlls/msvcirt/tests/msvcirt.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6358e94..2d9c235 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2390,7 +2390,14 @@ ostream* __thiscall ostream_scalar_dtor(ios *base, unsigned int flags) DEFINE_THISCALL_WRAPPER(ostream_flush, 4) ostream* __thiscall ostream_flush(ostream *this) { - FIXME("(%p) stub\n", this); + ios *base = ostream_get_ios(this); + + TRACE("(%p)\n", this); + + ios_lockbuf(base); + if (call_streambuf_sync(base->sb) == EOF) + ios_clear(base, base->state | IOSTATE_failbit); + ios_unlockbuf(base); return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index f17c2ef..045c224 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -261,6 +261,7 @@ static void (*__thiscall p_ostream_dtor)(ios*); static ostream* (*__thiscall p_ostream_assign)(ostream*, const ostream*); static ostream* (*__thiscall p_ostream_assign_sb)(ostream*, streambuf*); static void (*__thiscall p_ostream_vbase_dtor)(ostream*); +static ostream* (*__thiscall p_ostream_flush)(ostream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -426,6 +427,7 @@ static BOOL init(void) SET(p_ostream_assign, "??4ostream@@IEAAAEAV0(a)AEBV0@@Z"); SET(p_ostream_assign_sb, "??4ostream@@IEAAAEAV0(a)PEAVstreambuf@@@Z"); SET(p_ostream_vbase_dtor, "??_Dostream@@QEAAXXZ"); + SET(p_ostream_flush, "?flush(a)ostream@@QEAAAEAV1(a)XZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -521,6 +523,7 @@ static BOOL init(void) SET(p_ostream_assign, "??4ostream@@IAEAAV0(a)ABV0@@Z"); SET(p_ostream_assign_sb, "??4ostream@@IAEAAV0(a)PAVstreambuf@@@Z"); SET(p_ostream_vbase_dtor, "??_Dostream@@QAEXXZ"); + SET(p_ostream_flush, "?flush(a)ostream@@QAEAAV1(a)XZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -2508,12 +2511,15 @@ static void test_ios(void) static void test_ostream(void) { ostream os1, os2, *pos; - filebuf fb1, *pfb; + filebuf fb1, fb2, *pfb; const char filename1[] = "test1"; + const char filename2[] = "test2"; + int ret; memset(&os1, 0xab, sizeof(ostream)); memset(&os2, 0xab, sizeof(ostream)); memset(&fb1, 0xab, sizeof(filebuf)); + memset(&fb2, 0xab, sizeof(filebuf)); /* constructors/destructors */ pos = (ostream*) call_func2(p_ostream_ctor, &os1, TRUE); @@ -2626,10 +2632,46 @@ static void test_ostream(void) { ok(os2.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, os2.base_ios.state); ok(os2.base_ios.special[0] == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, os2.base_ios.fill); + /* flush */ +if (0) /* crashes on native */ + pos = (ostream*) call_func1(p_ostream_flush, &os1); + os1.base_ios.sb = (streambuf*) &fb2; + call_func1(p_filebuf_ctor, &fb2); + pos = (ostream*) call_func1(p_ostream_flush, &os1); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + os1.base_ios.sb = (streambuf*) &fb1; + os1.base_ios.state = IOSTATE_eofbit; + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "Never gonna tell a lie", 22); + ok(ret == 22, "expected 22 got %d\n", ret); + 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 + 22, "wrong put pointer, expected %p got %p\n", fb1.base.base + 22, fb1.base.pptr); + pos = (ostream*) call_func1(p_ostream_flush, &os1); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, os1.base_ios.state); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + os1.base_ios.tie = &os2; + os2.base_ios.sb = (streambuf*) &fb2; + os2.base_ios.state = IOSTATE_goodbit; + pfb = (filebuf*) call_func4(p_filebuf_open, &fb2, filename2, OPENMODE_out, filebuf_openprot); + ok(pfb == &fb2, "wrong return, expected %p got %p\n", &fb2, pfb); + ret = (int) call_func3(p_streambuf_xsputn, &fb2.base, "and hurt you", 12); + ok(ret == 12, "expected 12 got %d\n", ret); + ok(fb2.base.pbase == fb2.base.base, "wrong put base, expected %p got %p\n", fb2.base.base, fb2.base.pbase); + ok(fb2.base.pptr == fb2.base.base + 12, "wrong put pointer, expected %p got %p\n", fb2.base.base + 12, fb2.base.pptr); + pos = (ostream*) call_func1(p_ostream_flush, &os1); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(fb2.base.pbase == fb2.base.base, "wrong put base, expected %p got %p\n", fb2.base.base, fb2.base.pbase); + ok(fb2.base.pptr == fb2.base.base + 12, "wrong put pointer, expected %p got %p\n", fb2.base.base + 12, fb2.base.pptr); + call_func1(p_ostream_vbase_dtor, &os1); call_func1(p_ostream_vbase_dtor, &os2); call_func1(p_filebuf_dtor, &fb1); + call_func1(p_filebuf_dtor, &fb2); ok(_unlink(filename1) == 0, "Couldn't unlink file named '%s'\n", filename1); + ok(_unlink(filename2) == 0, "Couldn't unlink file named '%s'\n", filename2); } START_TEST(msvcirt)

1 0

Piotr Caban : msvcp90: Fix base computation in vbase destructors.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: c5075c057cedbf3eb421d7b16bb461ccb2bf9d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5075c057cedbf3eb421d7b16… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 15 12:02:32 2016 +0200 msvcp90: Fix base computation in vbase destructors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 126 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5075c057cedbf3eb421d…

1 0

Hans Leidekker : webservices/tests: Add message tests.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: c97da062ffced7ecce78a0d7ffe39ea54f1691b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97da062ffced7ecce78a0d7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:25 2016 +0200 webservices/tests: Add message tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 1 + dlls/webservices/tests/msg.c | 74 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index c278a47..afff870 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = webservices C_SRCS = \ channel.c \ + msg.c \ proxy.c \ reader.c \ url.c \ diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c new file mode 100644 index 0000000..852407c --- /dev/null +++ b/dlls/webservices/tests/msg.c @@ -0,0 +1,74 @@ +/* + * Copyright 2016 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include "windows.h" +#include "webservices.h" +#include "wine/test.h" + +static void test_WsCreateMessage(void) +{ + HRESULT hr; + WS_MESSAGE *msg; + WS_ENVELOPE_VERSION env_version; + WS_ADDRESSING_VERSION addr_version; + WS_MESSAGE_PROPERTY prop; + + hr = WsCreateMessage( 0, 0, NULL, 0, NULL, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( 0, 0, NULL, 0, &msg, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, 0, NULL, 0, &msg, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( 0, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + env_version = WS_ENVELOPE_VERSION_SOAP_1_1; + prop.id = WS_MESSAGE_PROPERTY_ENVELOPE_VERSION; + prop.value = &env_version; + prop.valueSize = sizeof(env_version); + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, &prop, + 1, &msg, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, + 0, &msg, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + env_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_1, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_0_9, "got %u\n", addr_version ); + + WsFreeMessage( msg ); +} + +START_TEST(msg) +{ + test_WsCreateMessage(); +}

1 0

Hans Leidekker : webservices: Implement WsCreateMessage and WsFreeMessage.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 33cebe51e1a291bbc21378a3f7c9614504b45c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33cebe51e1a291bbc21378a3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:23 2016 +0200 webservices: Implement WsCreateMessage and WsFreeMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/msg.c | 128 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +- 3 files changed, 131 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index acb7d0e..12b647a 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = user32 C_SRCS = \ channel.c \ main.c \ + msg.c \ proxy.c \ reader.c \ url.c \ diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c new file mode 100644 index 0000000..85a27f5 --- /dev/null +++ b/dlls/webservices/msg.c @@ -0,0 +1,128 @@ +/* + * Copyright 2016 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "webservices.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "webservices_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(webservices); + +static const struct prop_desc msg_props[] = +{ + { sizeof(WS_MESSAGE_STATE), TRUE }, /* WS_MESSAGE_PROPERTY_STATE */ + { sizeof(WS_HEAP *), TRUE }, /* WS_MESSAGE_PROPERTY_HEAP */ + { sizeof(WS_ENVELOPE_VERSION), FALSE }, /* WS_MESSAGE_PROPERTY_ENVELOPE_VERSION */ + { sizeof(WS_ADDRESSING_VERSION), FALSE }, /* WS_MESSAGE_PROPERTY_ADDRESSING_VERSION */ + { sizeof(WS_XML_BUFFER *), TRUE }, /* WS_MESSAGE_PROPERTY_HEADER_BUFFER */ + { sizeof(WS_XML_NODE_POSITION *), TRUE }, /* WS_MESSAGE_PROPERTY_HEADER_POSITION */ + { sizeof(WS_XML_READER *), TRUE }, /* WS_MESSAGE_PROPERTY_BODY_READER */ + { sizeof(WS_XML_WRITER *), TRUE }, /* WS_MESSAGE_PROPERTY_BODY_WRITER */ + { sizeof(BOOL), TRUE }, /* WS_MESSAGE_PROPERTY_IS_ADDRESSED */ +}; + +struct msg +{ + WS_MESSAGE_STATE state; + ULONG prop_count; + struct prop prop[sizeof(msg_props)/sizeof(msg_props[0])]; +}; + +static struct msg *alloc_msg(void) +{ + static const ULONG count = sizeof(msg_props)/sizeof(msg_props[0]); + struct msg *ret; + ULONG size = sizeof(*ret) + prop_size( msg_props, count ); + + if (!(ret = heap_alloc_zero( size ))) return NULL; + ret->state = WS_MESSAGE_STATE_EMPTY; + prop_init( msg_props, count, ret->prop, &ret[1] ); + ret->prop_count = count; + return ret; +} + +static void free_msg( struct msg *msg ) +{ + heap_free( msg ); +} + +static HRESULT create_msg( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_VERSION addr_version, + const WS_MESSAGE_PROPERTY *properties, ULONG count, WS_MESSAGE **handle ) +{ + struct msg *msg; + HRESULT hr; + ULONG i; + + if (!(msg = alloc_msg())) return E_OUTOFMEMORY; + + prop_set( msg->prop, msg->prop_count, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version) ); + prop_set( msg->prop, msg->prop_count, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version) ); + + for (i = 0; i < count; i++) + { + if (properties[i].id == WS_MESSAGE_PROPERTY_ENVELOPE_VERSION || + properties[i].id == WS_MESSAGE_PROPERTY_ADDRESSING_VERSION) + { + free_msg( msg ); + return E_INVALIDARG; + } + hr = prop_set( msg->prop, msg->prop_count, properties[i].id, properties[i].value, + properties[i].valueSize ); + if (hr != S_OK) + { + free_msg( msg ); + return hr; + } + } + + *handle = (WS_MESSAGE *)msg; + return S_OK; +} + +/************************************************************************** + * WsCreateMessage [webservices.@] + */ +HRESULT WINAPI WsCreateMessage( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_VERSION addr_version, + const WS_MESSAGE_PROPERTY *properties, ULONG count, WS_MESSAGE **handle, + WS_ERROR *error ) +{ + TRACE( "%u %u %p %u %p %p\n", env_version, addr_version, properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !env_version || !addr_version) return E_INVALIDARG; + return create_msg( env_version, addr_version, properties, count, handle ); +} + +/************************************************************************** + * WsFreeMessage [webservices.@] + */ +void WINAPI WsFreeMessage( WS_MESSAGE *handle ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p\n", handle ); + free_msg( msg ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 3c6262b..c7794a3 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -26,7 +26,7 @@ @ stub WsCreateFaultFromError @ stdcall WsCreateHeap(long long ptr long ptr ptr) @ stub WsCreateListener -@ stub WsCreateMessage +@ stdcall WsCreateMessage(long long ptr long ptr ptr) @ stub WsCreateMessageForChannel @ stub WsCreateMetadata @ stdcall WsCreateReader(ptr long ptr ptr) @@ -52,7 +52,7 @@ @ stdcall WsFreeError(ptr) @ stdcall WsFreeHeap(ptr) @ stub WsFreeListener -@ stub WsFreeMessage +@ stdcall WsFreeMessage(ptr) @ stub WsFreeMetadata @ stdcall WsFreeReader(ptr) @ stub WsFreeSecurityToken

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: a684e0bc6155f482f28448f274634b274bcac0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a684e0bc6155f482f28448f27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:22 2016 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 78d53bc..451cfad 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -66,6 +66,13 @@ typedef struct _WS_HTTPS_URL WS_HTTPS_URL; typedef struct _WS_NETTCP_URL WS_NETTCP_URL; typedef struct _WS_SOAPUDP_URL WS_SOAPUDP_URL; typedef struct _WS_NETPIPE_URL WS_NETPIPE_URL; +typedef struct _WS_CUSTOM_CHANNEL_CALLBACKS WS_CUSTOM_CHANNEL_CALLBACKS; +typedef struct _WS_CHANNEL_ENCODER WS_CHANNEL_ENCODER; +typedef struct _WS_CHANNEL_DECODER WS_CHANNEL_DECODER; +typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY; +typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING; +typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING; +typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -248,6 +255,9 @@ typedef struct _WS_ASYNC_CONTEXT { typedef HRESULT (CALLBACK *WS_READ_CALLBACK) (void*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); +typedef HRESULT (CALLBACK *WS_WRITE_CALLBACK) + (void*, const WS_BYTES*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); + typedef struct _WS_XML_READER_STREAM_INPUT { WS_XML_READER_INPUT input; WS_READ_CALLBACK readCallback; @@ -1072,6 +1082,190 @@ struct _WS_NETPIPE_URL { WS_STRING fragment; }; +typedef enum +{ + WS_IP_VERSION_4 = 1, + WS_IP_VERSION_6 = 2, + WS_IP_VERSION_AUTO = 3 +} WS_IP_VERSION; + +typedef enum +{ + WS_BUFFERED_TRANSFER_MODE = 0x0, + WS_STREAMED_INPUT_TRANSFER_MODE = 0x1, + WS_STREAMED_OUTPUT_TRANSFER_MODE = 0x2, + WS_STREAMED_TRANSFER_MODE = (WS_STREAMED_INPUT_TRANSFER_MODE|WS_STREAMED_OUTPUT_TRANSFER_MODE) +} WS_TRANSFER_MODE; + +typedef HRESULT (CALLBACK *WS_CREATE_CHANNEL_CALLBACK) + (WS_CHANNEL_TYPE, const void*, ULONG, void**, WS_ERROR*); + +typedef void (CALLBACK *WS_FREE_CHANNEL_CALLBACK) + (void*); + +typedef HRESULT (CALLBACK *WS_RESET_CHANNEL_CALLBACK) + (void*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_OPEN_CHANNEL_CALLBACK) + (void*, const WS_ENDPOINT_ADDRESS*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_CLOSE_CHANNEL_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ABORT_CHANNEL_CALLBACK) + (void*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_GET_CHANNEL_PROPERTY_CALLBACK) + (void*, WS_CHANNEL_PROPERTY_ID, void*, ULONG, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_SET_CHANNEL_PROPERTY_CALLBACK) + (void*, WS_CHANNEL_PROPERTY_ID, const void*, ULONG, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_WRITE_MESSAGE_START_CALLBACK) + (void*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_WRITE_MESSAGE_END_CALLBACK) + (void*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_READ_MESSAGE_START_CALLBACK) + (void*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_READ_MESSAGE_END_CALLBACK) + (void*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ABANDON_MESSAGE_CALLBACK) + (void*, WS_MESSAGE*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_SHUTDOWN_SESSION_CHANNEL_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +struct _WS_CUSTOM_CHANNEL_CALLBACKS +{ + WS_CREATE_CHANNEL_CALLBACK createChannelCallback; + WS_FREE_CHANNEL_CALLBACK freeChannelCallback; + WS_RESET_CHANNEL_CALLBACK resetChannelCallback; + WS_OPEN_CHANNEL_CALLBACK openChannelCallback; + WS_CLOSE_CHANNEL_CALLBACK closeChannelCallback; + WS_ABORT_CHANNEL_CALLBACK abortChannelCallback; + WS_GET_CHANNEL_PROPERTY_CALLBACK getChannelPropertyCallback; + WS_SET_CHANNEL_PROPERTY_CALLBACK setChannelPropertyCallback; + WS_WRITE_MESSAGE_START_CALLBACK writeMessageStartCallback; + WS_WRITE_MESSAGE_END_CALLBACK writeMessageEndCallback; + WS_READ_MESSAGE_START_CALLBACK readMessageStartCallback; + WS_READ_MESSAGE_END_CALLBACK readMessageEndCallback; + WS_ABANDON_MESSAGE_CALLBACK abandonMessageCallback; + WS_SHUTDOWN_SESSION_CHANNEL_CALLBACK shutdownSessionChannelCallback; +}; + +typedef HRESULT (CALLBACK *WS_CREATE_ENCODER_CALLBACK) + (void*, WS_WRITE_CALLBACK, void*, void**, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ENCODER_GET_CONTENT_TYPE_CALLBACK) + (void*, const WS_STRING*, WS_STRING*, WS_STRING*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ENCODER_START_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ENCODER_ENCODE_CALLBACK) + (void*, const WS_BYTES*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ENCODER_END_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef void (CALLBACK *WS_FREE_ENCODER_CALLBACK) + (void*); + +struct _WS_CHANNEL_ENCODER +{ + void *createContext; + WS_CREATE_ENCODER_CALLBACK createEncoderCallback; + WS_ENCODER_GET_CONTENT_TYPE_CALLBACK encoderGetContentTypeCallback; + WS_ENCODER_START_CALLBACK encoderStartCallback; + WS_ENCODER_ENCODE_CALLBACK encoderEncodeCallback; + WS_ENCODER_END_CALLBACK encoderEndCallback; + WS_FREE_ENCODER_CALLBACK freeEncoderCallback; +}; + +typedef HRESULT (CALLBACK *WS_CREATE_DECODER_CALLBACK) + (void*, WS_READ_CALLBACK, void*, void**, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_DECODER_GET_CONTENT_TYPE_CALLBACK) + (void*, const WS_STRING*, const WS_STRING*, WS_STRING*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_DECODER_START_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_DECODER_DECODE_CALLBACK) + (void*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_DECODER_END_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef void (CALLBACK *WS_FREE_DECODER_CALLBACK) + (void*); + +struct _WS_CHANNEL_DECODER +{ + void *createContext; + WS_CREATE_DECODER_CALLBACK createDecoderCallback; + WS_DECODER_GET_CONTENT_TYPE_CALLBACK decoderGetContentTypeCallback; + WS_DECODER_START_CALLBACK decoderStartCallback; + WS_DECODER_DECODE_CALLBACK decoderDecodeCallback; + WS_DECODER_END_CALLBACK decoderEndCallback; + WS_FREE_DECODER_CALLBACK freeDecoderCallback; +}; + +typedef enum +{ + WS_PROTECTION_LEVEL_NONE = 1, + WS_PROTECTION_LEVEL_SIGN = 2, + WS_PROTECTION_LEVEL_SIGN_AND_ENCRYPT = 3 +} WS_PROTECTION_LEVEL; + +typedef enum +{ + WS_MANUAL_COOKIE_MODE = 1, + WS_AUTO_COOKIE_MODE = 2 +} WS_COOKIE_MODE; + +typedef enum +{ + WS_HTTP_PROXY_SETTING_MODE_AUTO = 0x1, + WS_HTTP_PROXY_SETTING_MODE_NONE = 0x2, + WS_HTTP_PROXY_SETTING_MODE_CUSTOM = 0x3 +} WS_HTTP_PROXY_SETTING_MODE; + +struct _WS_CUSTOM_HTTP_PROXY +{ + WS_STRING servers; + WS_STRING bypass; +}; + +struct _WS_HTTP_HEADER_MAPPING +{ + WS_XML_STRING headerName; + ULONG headerMappingOptions; +}; + +struct _WS_HTTP_MESSAGE_MAPPING +{ + ULONG requestMappingOptions; + ULONG responseMappingOptions; + WS_HTTP_HEADER_MAPPING **requestHeaderMappings; + ULONG requestHeaderMappingCount; + WS_HTTP_HEADER_MAPPING **responseHeaderMappings; + ULONG responseHeaderMappingCount; +}; + +typedef HRESULT (CALLBACK *WS_HTTP_REDIRECT_CALLBACK) + (void*, const WS_STRING*, const WS_STRING*); + +struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT +{ + WS_HTTP_REDIRECT_CALLBACK callback; + void *state; +}; + HRESULT WINAPI WsAlloc(WS_HEAP*, SIZE_T, void**, WS_ERROR*); HRESULT WINAPI WsCall(WS_SERVICE_PROXY*, const WS_OPERATION_DESCRIPTION*, const void**, WS_HEAP*, const WS_CALL_PROPERTY*, const ULONG, const WS_ASYNC_CONTEXT*, @@ -1117,6 +1311,7 @@ HRESULT WINAPI WsGetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, void*, HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetMessageProperty(WS_MESSAGE*, WS_MESSAGE_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetNamespaceFromPrefix(WS_XML_READER*, const WS_XML_STRING*, BOOL, const WS_XML_STRING**, WS_ERROR*); HRESULT WINAPI WsGetPrefixFromNamespace(WS_XML_WRITER*, const WS_XML_STRING*, BOOL, @@ -1159,6 +1354,7 @@ HRESULT WINAPI WsSetInput(WS_XML_READER*, const WS_XML_READER_ENCODING*, const W const WS_XML_READER_PROPERTY*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetInputToBuffer(WS_XML_READER*, WS_XML_BUFFER*, const WS_XML_READER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsSetMessageProperty(WS_MESSAGE*, WS_MESSAGE_PROPERTY_ID, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetOutput(WS_XML_WRITER*, const WS_XML_WRITER_ENCODING*, const WS_XML_WRITER_OUTPUT*, const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_WRITER_PROPERTY*,

1 0

Hans Leidekker : webservices: Add support for reading GUID values.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: dbbcd290fdfaf21b2e5e4b09335f439a309502ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbcd290fdfaf21b2e5e4b093… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:21 2016 +0200 webservices: Add support for reading GUID values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 103 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 33 +++++++++++++ include/webservices.h | 1 + 3 files changed, 137 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 6452e21..ca8f1bd 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2108,6 +2108,52 @@ done: return hr; } +static HRESULT str_to_guid( const unsigned char *str, ULONG len, GUID *ret ) +{ + static const unsigned char hex[] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x00 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x10 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x20 */ + 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, /* 0x30 */ + 0,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0, /* 0x40 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x50 */ + 0,10,11,12,13,14,15 /* 0x60 */ + }; + const unsigned char *p = str; + ULONG i; + + while (len && read_isspace( *p )) { p++; len--; } + while (len && read_isspace( p[len - 1] )) { len--; } + if (len != 36) return WS_E_INVALID_FORMAT; + + if (p[8] != '-' || p[13] != '-' || p[18] != '-' || p[23] != '-') + return WS_E_INVALID_FORMAT; + + for (i = 0; i < 36; i++) + { + if (i == 8 || i == 13 || i == 18 || i == 23) continue; + if (p[i] > 'f' || (!hex[p[i]] && p[i] != '0')) return WS_E_INVALID_FORMAT; + } + + ret->Data1 = hex[p[0]] << 28 | hex[p[1]] << 24 | hex[p[2]] << 20 | hex[p[3]] << 16 | + hex[p[4]] << 12 | hex[p[5]] << 8 | hex[p[6]] << 4 | hex[p[7]]; + + ret->Data2 = hex[p[9]] << 12 | hex[p[10]] << 8 | hex[p[11]] << 4 | hex[p[12]]; + ret->Data3 = hex[p[14]] << 12 | hex[p[15]] << 8 | hex[p[16]] << 4 | hex[p[17]]; + + ret->Data4[0] = hex[p[19]] << 4 | hex[p[20]]; + ret->Data4[1] = hex[p[21]] << 4 | hex[p[22]]; + ret->Data4[2] = hex[p[24]] << 4 | hex[p[25]]; + ret->Data4[3] = hex[p[26]] << 4 | hex[p[27]]; + ret->Data4[4] = hex[p[28]] << 4 | hex[p[29]]; + ret->Data4[5] = hex[p[30]] << 4 | hex[p[31]]; + ret->Data4[6] = hex[p[32]] << 4 | hex[p[33]]; + ret->Data4[7] = hex[p[34]] << 4 | hex[p[35]]; + + return S_OK; +} + #define TICKS_PER_SEC 10000000 #define TICKS_PER_MIN (60 * (ULONGLONG)TICKS_PER_SEC) #define TICKS_PER_HOUR (3600 * (ULONGLONG)TICKS_PER_SEC) @@ -3074,6 +3120,53 @@ static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mappin return S_OK; } +static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_GUID_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size ) +{ + WS_XML_UTF8_TEXT *utf8; + GUID val; + HRESULT hr; + BOOL found; + + if (desc) FIXME( "ignoring description\n" ); + + if ((hr = read_get_text( reader, mapping, localname, ns, &utf8, &found )) != S_OK) return hr; + if (found && (hr = str_to_guid( utf8->value.bytes, utf8->value.length, &val )) != S_OK) return hr; + + switch (option) + { + case WS_READ_REQUIRED_VALUE: + if (!found) return WS_E_INVALID_FORMAT; + if (size != sizeof(GUID)) return E_INVALIDARG; + *(GUID *)ret = val; + break; + + case WS_READ_REQUIRED_POINTER: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + { + GUID *heap_val = NULL; + if (size != sizeof(heap_val)) return E_INVALIDARG; + if (found) + { + if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; + *heap_val = val; + } + *(GUID **)ret = heap_val; + break; + } + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + return S_OK; +} + static BOOL is_empty_text_node( const struct node *node ) { const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)node; @@ -3182,6 +3275,9 @@ static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) case WS_DATETIME_TYPE: return sizeof(WS_DATETIME); + case WS_GUID_TYPE: + return sizeof(GUID); + case WS_WSZ_TYPE: return sizeof(WCHAR *); @@ -3211,6 +3307,7 @@ static WS_READ_OPTION get_array_read_option( WS_TYPE type ) case WS_ENUM_TYPE: case WS_STRUCT_TYPE: case WS_DATETIME_TYPE: + case WS_GUID_TYPE: return WS_READ_REQUIRED_VALUE; case WS_WSZ_TYPE: @@ -3315,6 +3412,7 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type ) case WS_DOUBLE_TYPE: case WS_ENUM_TYPE: case WS_DATETIME_TYPE: + case WS_GUID_TYPE: return WS_READ_REQUIRED_VALUE; case WS_WSZ_TYPE: @@ -3564,6 +3662,11 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return hr; break; + case WS_GUID_TYPE: + if ((hr = read_type_guid( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) + return hr; + break; + default: FIXME( "type %u not supported\n", type ); return E_NOTIMPL; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 310d973..4997f7a 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1321,6 +1321,8 @@ static void prepare_type_test( WS_XML_READER *reader, const char *data, ULONG si static void test_WsReadType(void) { static const WCHAR testW[] = {'t','e','s','t',0}; + static const GUID guid1 = {0,0,0,{0,0,0,0,0,0,0,0}}; + static const GUID guid2 = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; HRESULT hr; WS_XML_READER *reader; WS_HEAP *heap; @@ -1340,6 +1342,7 @@ static void test_WsReadType(void) UINT16 val_uint16; UINT32 val_uint32; UINT64 val_uint64; + GUID val_guid; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1579,6 +1582,36 @@ static void test_WsReadType(void) ok( hr == S_OK, "got %08x\n", hr ); ok( val_enum == 1, "got %d\n", val_enum ); + prepare_type_test( reader, "<t>{00000000-0000-0000-0000-000000000000}</t>", + sizeof("<t>{00000000-0000-0000-0000-000000000000}</t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + memset( &val_guid, 0xff, sizeof(val_guid) ); + prepare_type_test( reader, "<t> 00000000-0000-0000-0000-000000000000 </t>", + sizeof("<t> 00000000-0000-0000-0000-000000000000 </t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp( &val_guid, &guid1, sizeof(val_guid) ), "wrong guid\n" ); + + memset( &val_guid, 0, sizeof(val_guid) ); + prepare_type_test( reader, "<t>00000000-0000-0000-0000-0000000000a1</t>", + sizeof("<t>00000000-0000-0000-0000-0000000000a1</t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp( &val_guid, &guid2, sizeof(val_guid) ), "wrong guid\n" ); + + memset( &val_guid, 0, sizeof(val_guid) ); + prepare_type_test( reader, "<t>00000000-0000-0000-0000-0000000000A1</t>", + sizeof("<t>00000000-0000-0000-0000-0000000000A1</t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp( &val_guid, &guid2, sizeof(val_guid) ), "wrong guid\n" ); + WsFreeReader( reader ); WsFreeHeap( heap ); } diff --git a/include/webservices.h b/include/webservices.h index a8d74e9..78d53bc 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -59,6 +59,7 @@ typedef struct _WS_CALL_PROPERTY WS_CALL_PROPERTY; typedef struct _WS_DOUBLE_DESCRIPTION WS_DOUBLE_DESCRIPTION; typedef struct _WS_DATETIME WS_DATETIME; typedef struct _WS_DATETIME_DESCRIPTION WS_DATETIME_DESCRIPTION; +typedef struct _WS_GUID_DESCRIPTION WS_GUID_DESCRIPTION; typedef struct _WS_URL WS_URL; typedef struct _WS_HTTP_URL WS_HTTP_URL; typedef struct _WS_HTTPS_URL WS_HTTPS_URL;

1 0

Paul Gofman : d3dx9: Improve performance and memory usage in preshader constants setting.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: cd024a263feeaa325e188643ad21ce62b9bc0787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd024a263feeaa325e188643a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 9 19:09:18 2016 +0300 d3dx9: Improve performance and memory usage in preshader constants setting. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 15 ++- dlls/d3dx9_36/preshader.c | 250 ++++++++++++++++++++++++++++-------------- 2 files changed, 177 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd024a263feeaa325e188…

1 0

Iván Matellanes : msvcirt: Implement ostream:: writepad.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: d5f445511e57611c83b85e241e939b3ca7e598a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f445511e57611c83b85e241… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:24 2016 +0100 msvcirt: Implement ostream::writepad. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 26 +++++++++++++- dlls/msvcirt/tests/msvcirt.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 0879a1d..fe5901a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2561,7 +2561,31 @@ ostream* __thiscall ostream_write_unsigned_char(ostream *this, const unsigned ch DEFINE_THISCALL_WRAPPER(ostream_writepad, 12) ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char *str2) { - FIXME("(%p %s %s) stub\n", this, str1, str2); + ios *base = ostream_get_ios(this); + int len1 = strlen(str1), len2 = strlen(str2), i; + + TRACE("(%p %p %p)\n", this, str1, str2); + + /* left of the padding */ + if (base->flags & (FLAGS_left|FLAGS_internal)) { + if (streambuf_sputn(base->sb, str1, len1) != len1) + ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + if (!(base->flags & FLAGS_internal)) + if (streambuf_sputn(base->sb, str2, len2) != len2) + ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + } + /* add padding to fill the width */ + for (i = len1 + len2; i < base->width; i++) + if (streambuf_sputc(base->sb, base->fill) == EOF) + ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + /* right of the padding */ + if ((base->flags & (FLAGS_left|FLAGS_internal)) != FLAGS_left) { + if (!(base->flags & (FLAGS_left|FLAGS_internal))) + if (streambuf_sputn(base->sb, str1, len1) != len1) + ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + if (streambuf_sputn(base->sb, str2, len2) != len2) + ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index baabd65..a6916c1 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -269,6 +269,7 @@ static ostream* (*__thiscall p_ostream_write_char)(ostream*, const char*, int); static ostream* (*__thiscall p_ostream_seekp_offset)(ostream*, streamoff, ios_seek_dir); static ostream* (*__thiscall p_ostream_seekp)(ostream*, streampos); static streampos (*__thiscall p_ostream_tellp)(ostream*); +static ostream* (*__thiscall p_ostream_writepad)(ostream*, const char*, const char*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -442,6 +443,7 @@ static BOOL init(void) SET(p_ostream_seekp_offset, "?seekp(a)ostream@@QEAAAEAV1(a)JW4seek_dir@ios@@@Z"); SET(p_ostream_seekp, "?seekp(a)ostream@@QEAAAEAV1(a)J@Z"); SET(p_ostream_tellp, "?tellp(a)ostream@@QEAAJXZ"); + SET(p_ostream_writepad, "?writepad(a)ostream@@AEAAAEAV1(a)PEBD0@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -545,6 +547,7 @@ static BOOL init(void) SET(p_ostream_seekp_offset, "?seekp(a)ostream@@QAEAAV1(a)JW4seek_dir@ios@@@Z"); SET(p_ostream_seekp, "?seekp(a)ostream@@QAEAAV1(a)J@Z"); SET(p_ostream_tellp, "?tellp(a)ostream@@QAEJXZ"); + SET(p_ostream_writepad, "?writepad(a)ostream@@AAEAAV1(a)PBD0@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -2883,6 +2886,86 @@ if (0) /* crashes on native */ IOSTATE_eofbit|IOSTATE_failbit, os1.base_ios.state); fb1.fd = fd; + /* writepad */ + os1.base_ios.state = IOSTATE_eofbit; + os1.base_ios.flags = + FLAGS_right|FLAGS_hex|FLAGS_showbase|FLAGS_showpoint|FLAGS_showpos|FLAGS_uppercase|FLAGS_fixed; + os1.base_ios.fill = 'z'; + os1.base_ios.width = 9; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "a", "b"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 9, "zzzzzzzab", 9), "expected 'zzzzzzzab' got '%s'\n", fb1.base.pptr - 9); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "aa", "bb"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 9, "zzzzzaabb", 9), "expected 'zzzzzaabb' got '%s'\n", fb1.base.pptr - 9); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "aaaaa", "bbbbb"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 10, "aaaaabbbbb", 10), "expected 'aaaaabbbbb' got '%s'\n", fb1.base.pptr - 10); + os1.base_ios.flags |= FLAGS_internal; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "aa", "bb"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 9, "aazzzzzbb", 9), "expected 'aazzzzzbb' got '%s'\n", fb1.base.pptr - 9); + os1.base_ios.flags &= ~FLAGS_right; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "a", "b"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 9, "azzzzzzzb", 9), "expected 'azzzzzzzb' got '%s'\n", fb1.base.pptr - 9); + os1.base_ios.width = 6; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "1", "2"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "1zzzz2", 6), "expected '1zzzz2' got '%s'\n", fb1.base.pptr - 6); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "12345678", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 8, "12345678", 8), "expected '12345678' got '%s'\n", fb1.base.pptr - 8); + os1.base_ios.flags |= FLAGS_left; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "z1", "2z"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "z1zz2z", 6), "expected 'z1zz2z' got '%s'\n", fb1.base.pptr - 6); + os1.base_ios.flags &= ~FLAGS_internal; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "hell", "o"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "helloz", 6), "expected 'helloz' got '%s'\n", fb1.base.pptr - 6); + os1.base_ios.flags |= FLAGS_right; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "a", "b"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "abzzzz", 6), "expected 'abzzzz' got '%s'\n", fb1.base.pptr - 6); +if (0) /* crashes on native */ + pos = (ostream*) call_func3(p_ostream_writepad, &os1, NULL, "o"); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "", "hello"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "helloz", 6), "expected 'helloz' got '%s'\n", fb1.base.pptr - 6); + os1.base_ios.fill = '*'; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "******", 6), "expected '******' got '%s'\n", fb1.base.pptr - 6); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "aa", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "aa****", 6), "expected 'aa****' got '%s'\n", fb1.base.pptr - 6); + os1.base_ios.flags = 0; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "a", "b"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(!strncmp(fb1.base.pptr - 6, "****ab", 6), "expected '****ab' got '%s'\n", fb1.base.pptr - 6); + call_func1(p_filebuf_sync, &fb1); + fb1.fd = -1; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "aa", "bb"); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit|IOSTATE_eofbit, os1.base_ios.state); + os1.base_ios.state = IOSTATE_goodbit; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + os1.base_ios.state = IOSTATE_goodbit; + os1.base_ios.width = 0; + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, os1.base_ios.state); + pos = (ostream*) call_func3(p_ostream_writepad, &os1, "a", ""); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + fb1.fd = fd; + call_func1(p_ostream_vbase_dtor, &os1); call_func1(p_ostream_vbase_dtor, &os2); call_func1(p_filebuf_dtor, &fb1);

1 0

Iván Matellanes : msvcirt: Implement ostream::tellp.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 3f32455f01aaefb50ccb323ddbdd5974f533f253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f32455f01aaefb50ccb323dd… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:23 2016 +0100 msvcirt: Implement ostream::tellp. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 12 ++++++++++-- dlls/msvcirt/tests/msvcirt.c | 27 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 2464d4f..0879a1d 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2511,8 +2511,16 @@ ostream* __thiscall ostream_seekp_offset(ostream *this, streamoff off, ios_seek_ DEFINE_THISCALL_WRAPPER(ostream_tellp, 4) streampos __thiscall ostream_tellp(ostream *this) { - FIXME("(%p) stub\n", this); - return 0; + ios *base = ostream_get_ios(this); + streampos pos; + + TRACE("(%p)\n", this); + + ios_lockbuf(base); + if ((pos = call_streambuf_seekoff(base->sb, 0, SEEKDIR_cur, OPENMODE_out)) == EOF) + ios_clear(base, base->state | IOSTATE_failbit); + ios_unlockbuf(base); + return pos; } /* ?write(a)ostream@@QAEAAV1(a)PBDH@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3a6cb6e..baabd65 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -268,6 +268,7 @@ static ostream* (*__thiscall p_ostream_put_char)(ostream*, char); static ostream* (*__thiscall p_ostream_write_char)(ostream*, const char*, int); static ostream* (*__thiscall p_ostream_seekp_offset)(ostream*, streamoff, ios_seek_dir); static ostream* (*__thiscall p_ostream_seekp)(ostream*, streampos); +static streampos (*__thiscall p_ostream_tellp)(ostream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -440,6 +441,7 @@ static BOOL init(void) SET(p_ostream_write_char, "?write(a)ostream@@QEAAAEAV1(a)PEBDH@Z"); SET(p_ostream_seekp_offset, "?seekp(a)ostream@@QEAAAEAV1(a)JW4seek_dir@ios@@@Z"); SET(p_ostream_seekp, "?seekp(a)ostream@@QEAAAEAV1(a)J@Z"); + SET(p_ostream_tellp, "?tellp(a)ostream@@QEAAJXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -542,6 +544,7 @@ static BOOL init(void) SET(p_ostream_write_char, "?write(a)ostream@@QAEAAV1(a)PBDH@Z"); SET(p_ostream_seekp_offset, "?seekp(a)ostream@@QAEAAV1(a)JW4seek_dir@ios@@@Z"); SET(p_ostream_seekp, "?seekp(a)ostream@@QAEAAV1(a)J@Z"); + SET(p_ostream_tellp, "?tellp(a)ostream@@QAEJXZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -2856,6 +2859,30 @@ if (0) /* crashes on native */ ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + /* tellp */ + ret = (int) call_func1(p_ostream_tellp, &os1); + ok(ret == 0, "wrong return, expected 0 got %d\n", ret); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "to say it", 9); + ok(ret == 9, "expected 9 got %d\n", ret); + 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 + 9, "wrong put pointer, expected %p got %p\n", fb1.base.base + 9, fb1.base.pptr); + ret = (int) call_func1(p_ostream_tellp, &os1); + ok(ret == 9, "wrong return, expected 9 got %d\n", ret); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + os1.base_ios.state = IOSTATE_eofbit; + fd = fb1.fd; + fb1.fd = -1; + ret = (int) call_func1(p_ostream_tellp, &os1); + ok(ret == EOF, "wrong return, expected EOF got %d\n", ret); + ok(os1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, os1.base_ios.state); + fb1.fd = fd; + call_func1(p_ostream_vbase_dtor, &os1); call_func1(p_ostream_vbase_dtor, &os2); call_func1(p_filebuf_dtor, &fb1);

1 0