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

Hans Leidekker : webservices: Implement WsGetMessageProperty and WsSetMessageProperty.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 6d87b2489d72eab97e8b253192bda7805f1d019d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d87b2489d72eab97e8b25319… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:24 2016 +0200 webservices: Implement WsGetMessageProperty and WsSetMessageProperty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 28 ++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 85a27f5..47df32e 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -126,3 +126,31 @@ void WINAPI WsFreeMessage( WS_MESSAGE *handle ) TRACE( "%p\n", handle ); free_msg( msg ); } + +/************************************************************************** + * WsGetMessageProperty [webservices.@] + */ +HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID id, void *buf, + ULONG size, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + return prop_get( msg->prop, msg->prop_count, id, buf, size ); +} + +/************************************************************************** + * WsSetMessageProperty [webservices.@] + */ +HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID id, const void *value, + ULONG size, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %u %p %u\n", handle, id, value, size ); + if (error) FIXME( "ignoring error parameter\n" ); + + return prop_set( msg->prop, msg->prop_count, id, value, size ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index c7794a3..0093fc0 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -71,7 +71,7 @@ @ stdcall WsGetHeapProperty(ptr long ptr long ptr) @ stub WsGetListenerProperty @ stub WsGetMappedHeader -@ stub WsGetMessageProperty +@ stdcall WsGetMessageProperty(ptr long ptr long ptr) @ stub WsGetMetadataEndpoints @ stub WsGetMetadataProperty @ stub WsGetMissingMetadataDocumentAddress @@ -153,7 +153,7 @@ @ stdcall WsSetInput(ptr ptr ptr ptr long ptr) @ stdcall WsSetInputToBuffer(ptr ptr ptr long ptr) @ stub WsSetListenerProperty -@ stub WsSetMessageProperty +@ stdcall WsSetMessageProperty(ptr long ptr long ptr) @ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) @ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr) @ stub WsSetReaderPosition

1 0

Hans Leidekker : webservices/tests: Add message tests.
by Alexandre Julliard 15 Jun '16

15 Jun '16

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

Piotr Caban : msvcp90: Fix base computation in vbase destructors.
by Alexandre Julliard 15 Jun '16

15 Jun '16

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

Iván Matellanes : msvcirt: Implement ostream constructors/destructors.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: cf1f23379b57025fd8e6e202be95b71f668b81b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1f23379b57025fd8e6e202b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:16 2016 +0100 msvcirt: Implement ostream constructors/destructors. 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 | 105 ++++++++++++++++++++++++---- dlls/msvcirt/tests/msvcirt.c | 158 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 248 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf1f23379b57025fd8e6e…

1 0

Iván Matellanes : msvcirt: Implement ostream::flush.
by Alexandre Julliard 15 Jun '16

15 Jun '16

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

Iván Matellanes : msvcirt: Implement ostream::opfx.
by Alexandre Julliard 15 Jun '16

15 Jun '16

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::osfx.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 28d400be632d7675737f2ab57cdc5d31cbbfd72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d400be632d7675737f2ab57… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:19 2016 +0100 msvcirt: Implement ostream::osfx. 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 | 14 +++++++++++++- dlls/msvcirt/tests/msvcirt.c | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 54012c0..6872383 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2426,7 +2426,19 @@ int __thiscall ostream_opfx(ostream *this) DEFINE_THISCALL_WRAPPER(ostream_osfx, 4) void __thiscall ostream_osfx(ostream *this) { - FIXME("(%p) stub\n", this); + ios *base = ostream_get_ios(this); + + TRACE("(%p)\n", this); + + ios_unlockbuf(base); + ios_width_set(base, 0); + if (base->flags & FLAGS_unitbuf) + ostream_flush(this); + if (base->flags & FLAGS_stdio) { + fflush(stdout); + fflush(stderr); + } + ios_unlock(base); } /* ?put(a)ostream@@QAEAAV1(a)D@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 7197126..f29bafd 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -263,6 +263,7 @@ 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*); +static void (*__thiscall p_ostream_osfx)(ostream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -430,6 +431,7 @@ static BOOL init(void) 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"); + SET(p_ostream_osfx, "?osfx(a)ostream@@QEAAXXZ"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -527,6 +529,7 @@ static BOOL init(void) 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_ostream_osfx, "?osfx(a)ostream@@QAEXXZ"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -2707,6 +2710,28 @@ if (0) /* crashes on native */ 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); + /* osfx */ + os1.base_ios.state = IOSTATE_badbit; + os1.base_ios.width = 0xab; + call_func1(p_ostream_osfx, &os1); + ok(os1.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, os1.base_ios.state); + ok(os1.base_ios.width == 0, "expected 0 got %d\n", os1.base_ios.width); + 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); + os1.base_ios.state = IOSTATE_goodbit; + ret = (int) call_func1(p_ostream_opfx, &os1); + ok(ret == 1, "expected 1 got %d\n", ret); + os1.base_ios.sb = NULL; +if (0) /* crashes on native */ + call_func1(p_ostream_osfx, &os1); + os1.base_ios.sb = (streambuf*) &fb1; + os1.base_ios.flags = FLAGS_unitbuf; + call_func1(p_ostream_osfx, &os1); + ok(os1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, os1.base_ios.state); + ok(os1.base_ios.flags == FLAGS_unitbuf, "expected %d got %d\n", FLAGS_unitbuf, os1.base_ios.flags); + 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); + 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::put.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: e1b3a5290262c19d4e49dfbb30b8c96f300b86af URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b3a5290262c19d4e49dfbb3… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:20 2016 +0100 msvcirt: Implement ostream::put. 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 | 16 +++++++++----- dlls/msvcirt/tests/msvcirt.c | 51 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6872383..75c5a9d 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2446,7 +2446,15 @@ void __thiscall ostream_osfx(ostream *this) DEFINE_THISCALL_WRAPPER(ostream_put_char, 8) ostream* __thiscall ostream_put_char(ostream *this, char c) { - FIXME("(%p %c) stub\n", this, c); + ios *base = ostream_get_ios(this); + + TRACE("(%p %c)\n", this, c); + + if (ostream_opfx(this)) { + if (streambuf_sputc(base->sb, c) == EOF) + base->state = IOSTATE_badbit | IOSTATE_failbit; + ostream_osfx(this); + } return this; } @@ -2455,8 +2463,7 @@ ostream* __thiscall ostream_put_char(ostream *this, char c) DEFINE_THISCALL_WRAPPER(ostream_put_signed_char, 8) ostream* __thiscall ostream_put_signed_char(ostream *this, signed char c) { - FIXME("(%p %c) stub\n", this, c); - return this; + return ostream_put_char(this, (char) c); } /* ?put(a)ostream@@QAEAAV1(a)E@Z */ @@ -2464,8 +2471,7 @@ ostream* __thiscall ostream_put_signed_char(ostream *this, signed char c) DEFINE_THISCALL_WRAPPER(ostream_put_unsigned_char, 8) ostream* __thiscall ostream_put_unsigned_char(ostream *this, unsigned char c) { - FIXME("(%p %c) stub\n", this, c); - return this; + return ostream_put_char(this, (char) c); } /* ?seekp(a)ostream@@QAEAAV1(a)J@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index f29bafd..f846c9e 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -264,6 +264,7 @@ static void (*__thiscall p_ostream_vbase_dtor)(ostream*); static ostream* (*__thiscall p_ostream_flush)(ostream*); static int (*__thiscall p_ostream_opfx)(ostream*); static void (*__thiscall p_ostream_osfx)(ostream*); +static ostream* (*__thiscall p_ostream_put_char)(ostream*, char); /* Emulate a __thiscall */ #ifdef __i386__ @@ -432,6 +433,7 @@ static BOOL init(void) SET(p_ostream_flush, "?flush(a)ostream@@QEAAAEAV1(a)XZ"); SET(p_ostream_opfx, "?opfx(a)ostream@@QEAAHXZ"); SET(p_ostream_osfx, "?osfx(a)ostream@@QEAAXXZ"); + SET(p_ostream_put_char, "?put(a)ostream@@QEAAAEAV1(a)D@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -530,6 +532,7 @@ static BOOL init(void) SET(p_ostream_flush, "?flush(a)ostream@@QAEAAV1(a)XZ"); SET(p_ostream_opfx, "?opfx(a)ostream@@QAEHXZ"); SET(p_ostream_osfx, "?osfx(a)ostream@@QAEXXZ"); + SET(p_ostream_put_char, "?put(a)ostream@@QAEAAV1(a)D@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -2520,7 +2523,7 @@ static void test_ostream(void) { filebuf fb1, fb2, *pfb; const char filename1[] = "test1"; const char filename2[] = "test2"; - int ret; + int fd, ret; memset(&os1, 0xab, sizeof(ostream)); memset(&os2, 0xab, sizeof(ostream)); @@ -2732,6 +2735,52 @@ if (0) /* crashes on native */ 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); + /* put */ + ret = (int) call_func3(p_streambuf_xsputn, &fb2.base, "for so long", 11); + ok(ret == 11, "expected 11 got %d\n", ret); + os1.base_ios.state = IOSTATE_badbit; + os1.base_ios.width = 2; + pos = (ostream*) call_func2(p_ostream_put_char, &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); + ok(os1.base_ios.width == 2, "expected 2 got %d\n", os1.base_ios.width); + 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); + 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 + 11, "wrong put pointer, expected %p got %p\n", fb2.base.base + 11, fb2.base.pptr); + os1.base_ios.state = IOSTATE_goodbit; + pos = (ostream*) call_func2(p_ostream_put_char, &os1, 'a'); + 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); + ok(os1.base_ios.width == 0, "expected 0 got %d\n", os1.base_ios.width); + 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); + 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); + os1.base_ios.flags = 0; + pos = (ostream*) call_func2(p_ostream_put_char, &os1, 'b'); + 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); + 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); + os1.base_ios.sb = NULL; +if (0) /* crashes on native */ + pos = (ostream*) call_func2(p_ostream_put_char, &os1, 'c'); + os1.base_ios.sb = (streambuf*) &fb1; + os1.base_ios.width = 5; + call_func1(p_filebuf_sync, &fb1); + fd = fb1.fd; + fb1.fd = -1; + pos = (ostream*) call_func2(p_ostream_put_char, &os1, 'c'); + 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); + ok(os1.base_ios.width == 0, "expected 0 got %d\n", os1.base_ios.width); + 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); + 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::write.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: c4a5730ec3eb79c0ab341c5dc001a1b104b56a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a5730ec3eb79c0ab341c5dc… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:21 2016 +0100 msvcirt: Implement ostream::write. 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 | 16 +++++++++++----- dlls/msvcirt/tests/msvcirt.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 75c5a9d..9cb7a5c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2506,7 +2506,15 @@ streampos __thiscall ostream_tellp(ostream *this) DEFINE_THISCALL_WRAPPER(ostream_write_char, 12) ostream* __thiscall ostream_write_char(ostream *this, const char *str, int count) { - FIXME("(%p %s %d) stub\n", this, str, count); + ios *base = ostream_get_ios(this); + + TRACE("(%p %p %d)\n", this, str, count); + + if (ostream_opfx(this)) { + if (streambuf_sputn(base->sb, str, count) != count) + base->state = IOSTATE_badbit | IOSTATE_failbit; + ostream_osfx(this); + } return this; } @@ -2515,8 +2523,7 @@ ostream* __thiscall ostream_write_char(ostream *this, const char *str, int count DEFINE_THISCALL_WRAPPER(ostream_write_signed_char, 12) ostream* __thiscall ostream_write_signed_char(ostream *this, const signed char *str, int count) { - FIXME("(%p %s %d) stub\n", this, str, count); - return this; + return ostream_write_char(this, (const char*) str, count); } /* ?write(a)ostream@@QAEAAV1(a)PBEH@Z */ @@ -2524,8 +2531,7 @@ ostream* __thiscall ostream_write_signed_char(ostream *this, const signed char * DEFINE_THISCALL_WRAPPER(ostream_write_unsigned_char, 12) ostream* __thiscall ostream_write_unsigned_char(ostream *this, const unsigned char *str, int count) { - FIXME("(%p %s %d) stub\n", this, str, count); - return this; + return ostream_write_char(this, (const char*) str, count); } /* ?writepad(a)ostream@@AAEAAV1(a)PBD0@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index f846c9e..0563046 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -265,6 +265,7 @@ static ostream* (*__thiscall p_ostream_flush)(ostream*); static int (*__thiscall p_ostream_opfx)(ostream*); static void (*__thiscall p_ostream_osfx)(ostream*); static ostream* (*__thiscall p_ostream_put_char)(ostream*, char); +static ostream* (*__thiscall p_ostream_write_char)(ostream*, const char*, int); /* Emulate a __thiscall */ #ifdef __i386__ @@ -434,6 +435,7 @@ static BOOL init(void) SET(p_ostream_opfx, "?opfx(a)ostream@@QEAAHXZ"); SET(p_ostream_osfx, "?osfx(a)ostream@@QEAAXXZ"); SET(p_ostream_put_char, "?put(a)ostream@@QEAAAEAV1(a)D@Z"); + SET(p_ostream_write_char, "?write(a)ostream@@QEAAAEAV1(a)PEBDH@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -533,6 +535,7 @@ static BOOL init(void) SET(p_ostream_opfx, "?opfx(a)ostream@@QAEHXZ"); SET(p_ostream_osfx, "?osfx(a)ostream@@QAEXXZ"); SET(p_ostream_put_char, "?put(a)ostream@@QAEAAV1(a)D@Z"); + SET(p_ostream_write_char, "?write(a)ostream@@QAEAAV1(a)PBDH@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -2781,6 +2784,38 @@ if (0) /* crashes on native */ ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); fb1.fd = fd; + /* write */ + pos = (ostream*) call_func3(p_ostream_write_char, &os1, "Your", 4); + 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); + 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_goodbit; + os1.base_ios.width = 1; + pos = (ostream*) call_func3(p_ostream_write_char, &os1, "heart's", 7); + 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); + ok(os1.base_ios.width == 0, "expected 0 got %d\n", os1.base_ios.width); + 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 + 7, "wrong put pointer, expected %p got %p\n", fb1.base.base + 7, fb1.base.pptr); + os1.base_ios.sb = NULL; +if (0) /* crashes on native */ + pos = (ostream*) call_func3(p_ostream_write_char, &os1, "been", 4); + os1.base_ios.sb = (streambuf*) &fb1; + os1.base_ios.width = 5; + call_func1(p_filebuf_sync, &fb1); + fd = fb1.fd; + fb1.fd = -1; + pos = (ostream*) call_func3(p_ostream_write_char, &os1, "aching,", 7); + 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); + ok(os1.base_ios.width == 0, "expected 0 got %d\n", os1.base_ios.width); + 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); + 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::seekp.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: d77342ff96639d988b5f606f3882e7f34261be7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77342ff96639d988b5f606f3… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:22 2016 +0100 msvcirt: Implement ostream::seekp. 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 | 18 ++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 9cb7a5c..2464d4f 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2479,7 +2479,14 @@ ostream* __thiscall ostream_put_unsigned_char(ostream *this, unsigned char c) DEFINE_THISCALL_WRAPPER(ostream_seekp, 8) ostream* __thiscall ostream_seekp(ostream *this, streampos pos) { - FIXME("(%p %d) stub\n", this, pos); + ios *base = ostream_get_ios(this); + + TRACE("(%p %d)\n", this, pos); + + ios_lockbuf(base); + if (streambuf_seekpos(base->sb, pos, OPENMODE_out) == EOF) + ios_clear(base, base->state | IOSTATE_failbit); + ios_unlockbuf(base); return this; } @@ -2488,7 +2495,14 @@ ostream* __thiscall ostream_seekp(ostream *this, streampos pos) DEFINE_THISCALL_WRAPPER(ostream_seekp_offset, 12) ostream* __thiscall ostream_seekp_offset(ostream *this, streamoff off, ios_seek_dir dir) { - FIXME("(%p %d %d) stub\n", this, off, dir); + ios *base = ostream_get_ios(this); + + TRACE("(%p %d %d)\n", this, off, dir); + + ios_lockbuf(base); + if (call_streambuf_seekoff(base->sb, off, dir, OPENMODE_out) == 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 0563046..3a6cb6e 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -266,6 +266,8 @@ static int (*__thiscall p_ostream_opfx)(ostream*); static void (*__thiscall p_ostream_osfx)(ostream*); 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); /* Emulate a __thiscall */ #ifdef __i386__ @@ -436,6 +438,8 @@ static BOOL init(void) SET(p_ostream_osfx, "?osfx(a)ostream@@QEAAXXZ"); SET(p_ostream_put_char, "?put(a)ostream@@QEAAAEAV1(a)D@Z"); 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"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -536,6 +540,8 @@ static BOOL init(void) SET(p_ostream_osfx, "?osfx(a)ostream@@QAEXXZ"); SET(p_ostream_put_char, "?put(a)ostream@@QAEAAV1(a)D@Z"); 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_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -2816,6 +2822,40 @@ if (0) /* crashes on native */ ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); fb1.fd = fd; + /* seekp */ + os1.base_ios.state = IOSTATE_eofbit; + pos = (ostream*) call_func3(p_ostream_seekp_offset, &os1, 0, SEEKDIR_beg); + 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); + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "but", 3); + ok(ret == 3, "expected 3 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 + 3, "wrong put pointer, expected %p got %p\n", fb1.base.base + 3, fb1.base.pptr); + pos = (ostream*) call_func3(p_ostream_seekp_offset, &os1, 0, SEEKDIR_end); + 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); + pos = (ostream*) call_func3(p_ostream_seekp_offset, &os1, -1, SEEKDIR_beg); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, os1.base_ios.state); + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "You're too shy", 14); + ok(ret == 14, "expected 14 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 + 14, "wrong put pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.pptr); + pos = (ostream*) call_func2(p_ostream_seekp, &os1, 0); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|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_badbit; + pos = (ostream*) call_func2(p_ostream_seekp, &os1, -1); + 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); + call_func1(p_ostream_vbase_dtor, &os1); call_func1(p_ostream_vbase_dtor, &os2); call_func1(p_filebuf_dtor, &fb1);

1 0