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

Józef Kucia : wined3d: Recognize SM5 bfi opcode.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 8d14307f0023bb1b00ba7e6469d10b1cf6a46619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d14307f0023bb1b00ba7e646… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:34 2016 +0200 wined3d: Recognize SM5 bfi opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7bdf0ee..ad38bfe 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5212,6 +5212,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ADD */ shader_hw_map2gl, /* WINED3DSIH_AND */ NULL, /* WINED3DSIH_BEM */ pshader_hw_bem, + /* WINED3DSIH_BFI */ NULL, /* WINED3DSIH_BREAK */ shader_hw_break, /* WINED3DSIH_BREAKC */ shader_hw_breakc, /* WINED3DSIH_BREAKP */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e0c7c65..ab53231 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8546,6 +8546,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, /* WINED3DSIH_BEM */ shader_glsl_bem, + /* WINED3DSIH_BFI */ NULL, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, /* WINED3DSIH_BREAKP */ shader_glsl_breakp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a93a2f1..57dbaef 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -44,6 +44,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ADD */ "add", /* WINED3DSIH_AND */ "and", /* WINED3DSIH_BEM */ "bem", + /* WINED3DSIH_BFI */ "bfi", /* WINED3DSIH_BREAK */ "break", /* WINED3DSIH_BREAKC */ "breakc", /* WINED3DSIH_BREAKP */ "breakp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 888f341..885da50 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -210,6 +210,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, + WINED3D_SM5_OP_BFI = 0x8c, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN = 0x95, @@ -749,6 +750,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, + {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "uuuu"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", "", shader_sm5_read_control_point_count}, {WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9eba0ff..46899c2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -552,6 +552,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ADD, WINED3DSIH_AND, WINED3DSIH_BEM, + WINED3DSIH_BFI, WINED3DSIH_BREAK, WINED3DSIH_BREAKC, WINED3DSIH_BREAKP,

1 0

Béla Gyebrószki : wined3d: Add Nvidia GeForce GT 730 (GK208).
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 72cdfff3e5b8dafbe71ad353f442bc8c67be568d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72cdfff3e5b8dafbe71ad353f… Author: Béla Gyebrószki <gyebro69(a)gmail.com> Date: Fri Jun 10 20:15:11 2016 +0200 wined3d: Add Nvidia GeForce GT 730 (GK208). Signed-off-by: Béla Gyebrószki <gyebro69(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 48feeef..4fc7736 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1279,6 +1279,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, @@ -1788,6 +1789,7 @@ cards_nvidia_binary[] = {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ {"GT 750M", CARD_NVIDIA_GEFORCE_GT750M}, /* Geforce 700 - midend mobile */ {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ + {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7207523..ffcfb81 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1821,6 +1821,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9, CARD_NVIDIA_GEFORCE_GTX750 = 0x1381,

1 0

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

June 15, 2016

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

Hans Leidekker : webservices: Implement WsGetMessageProperty and WsSetMessageProperty.
by Alexandre Julliard June 15, 2016

June 15, 2016

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: Avoid writing redundant namespace attributes.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: acf64c4e68510915c79dc482bbf926b65bd09389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf64c4e68510915c79dc482b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:20 2016 +0200 webservices: Avoid writing redundant namespace attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 15 +++++++++++++++ dlls/webservices/writer.c | 29 ++++++++++++++++++----------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 4f6b1b1..4e22887 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1072,6 +1072,7 @@ static void test_WsWriteXmlnsAttribute(void) WS_XML_STRING ns = {2, (BYTE *)"ns"}, ns2 = {3, (BYTE *)"ns2"}; WS_XML_STRING prefix = {6, (BYTE *)"prefix"}, prefix2 = {7, (BYTE *)"prefix2"}; WS_XML_STRING xmlns = {6, (BYTE *)"xmlns"}, attr = {4, (BYTE *)"attr"}; + WS_XML_STRING localname = {1, (BYTE *)"u"}; WS_HEAP *heap; WS_XML_BUFFER *buffer; WS_XML_WRITER *writer; @@ -1211,6 +1212,20 @@ static void test_WsWriteXmlnsAttribute(void) check_output_buffer( buffer, "<prefix:t prefix:attr='' xmlns:prefix='ns' xmlns:prefix2='ns2'/>", __LINE__ ); WsFreeHeap( heap ); + /* scope */ + prepare_xmlns_test( writer, &heap, &buffer ); + hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns2, TRUE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &prefix2, &localname, &ns2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_buffer( buffer, "<prefix:t xmlns:prefix2='ns2' xmlns:prefix=\"ns\"><prefix2:u/></prefix:t>", + __LINE__ ); + WsFreeHeap( heap ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 20e17d0..ecbba37 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -633,21 +633,28 @@ static HRESULT write_add_namespace_attribute( struct writer *writer, const WS_XM return S_OK; } -static const WS_XML_ATTRIBUTE *find_namespace_attribute( const WS_XML_ELEMENT_NODE *elem, - const WS_XML_STRING *prefix, - const WS_XML_STRING *ns ) +static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_STRING *prefix, + const WS_XML_STRING *ns ) { ULONG i; - for (i = 0; i < elem->attributeCount; i++) + const struct node *node; + + for (node = (const struct node *)elem; node; node = node->parent) { - if (!elem->attributes[i]->isXmlNs) continue; - if (WsXmlStringEquals( elem->attributes[i]->prefix, prefix, NULL ) == S_OK && - WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) == S_OK) + if (node_type( node ) != WS_XML_NODE_TYPE_ELEMENT) break; + + elem = &node->hdr; + for (i = 0; i < elem->attributeCount; i++) { - return elem->attributes[i]; + if (!elem->attributes[i]->isXmlNs) continue; + if (WsXmlStringEquals( elem->attributes[i]->prefix, prefix, NULL ) == S_OK && + WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) == S_OK) + { + return TRUE; + } } } - return NULL; + return FALSE; } static HRESULT write_set_element_namespace( struct writer *writer ) @@ -656,7 +663,7 @@ static HRESULT write_set_element_namespace( struct writer *writer ) HRESULT hr; if (!elem->ns->length || is_current_namespace( writer, elem->ns ) || - find_namespace_attribute( elem, elem->prefix, elem->ns )) return S_OK; + namespace_in_scope( elem, elem->prefix, elem->ns )) return S_OK; if ((hr = write_add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) return hr; @@ -1689,6 +1696,6 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING if (!writer || !ns) return E_INVALIDARG; if (writer->state != WRITER_STATE_STARTELEMENT) return WS_E_INVALID_OPERATION; - if (find_namespace_attribute( &writer->current->hdr, prefix, ns )) return S_OK; + if (namespace_in_scope( &writer->current->hdr, prefix, ns )) return S_OK; return write_add_namespace_attribute( writer, prefix, ns, single ); }

1 0

Hugh McMaster : reg: Parse the registry key using a helper function.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 4a22ba5b46f463484ef09f0618e8c750aadbb513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a22ba5b46f463484ef09f061… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 15 02:30:53 2016 +0000 reg: Parse the registry key using a helper function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 20df2dd..6f8a882 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -818,6 +818,24 @@ static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return ret; } +static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) +{ + if (!sane_path(key)) + return FALSE; + + *root = path_get_rootkey(key); + if (!*root) + { + output_message(STRING_INVALID_KEY); + return FALSE; + } + + *path = strchrW(key, '\\'); + if (*path) (*path)++; + + return TRUE; +} + static BOOL is_help_switch(const WCHAR *s) { if (strlenW(s) > 2) @@ -906,20 +924,10 @@ int wmain(int argc, WCHAR *argvW[]) return 0; } - key_name = argvW[2]; - - if (!sane_path(key_name)) - return 1; - - root = path_get_rootkey(key_name); - if (!root) - { - output_message(STRING_INVALID_KEY); + if (!parse_registry_key(argvW[2], &root, &path)) return 1; - } - path = strchrW(key_name, '\\'); - if (path) path++; + key_name = argvW[2]; for (i = 3; i < argc; i++) {

1 0

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

June 15, 2016

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

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

June 15, 2016

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::put.
by Alexandre Julliard June 15, 2016

June 15, 2016

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::osfx.
by Alexandre Julliard June 15, 2016

June 15, 2016

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