wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Hans Leidekker : webservices: Implement WsRemoveMappedHeader.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 95dd6a873860435b39424adf62f034c710b678f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95dd6a873860435b39424adf6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:24:02 2016 +0200 webservices: Implement WsRemoveMappedHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 29 +++++++++++++++++++++++++++++ dlls/webservices/tests/msg.c | 35 +++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index e55e861..f13e3cc 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -778,3 +778,32 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, msg->header[i] = header; return S_OK; } + +/************************************************************************** + * WsRemoveMappedHeader [webservices.@] + */ +HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + ULONG i; + + TRACE( "%p %s %p\n", handle, debugstr_xmlstr(name), error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !name) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type || !msg->header[i]->mapped) continue; + if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK) + { + free_header( msg->header[i] ); + memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i) * sizeof(struct header *) ); + msg->header_count--; + break; + } + } + + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 1458488..73fcfd6 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -703,6 +703,40 @@ static void test_WsAddMappedHeader(void) WsFreeMessage( msg ); } +static void test_WsRemoveMappedHeader(void) +{ + static const WS_XML_STRING header = {6, (BYTE *)"Header"}, value = {5, (BYTE *)"value"}; + WS_MESSAGE *msg; + HRESULT hr; + + hr = WsRemoveMappedHeader( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsRemoveMappedHeader( msg, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsRemoveMappedHeader( msg, &header, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsRemoveMappedHeader( msg, &header, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* again */ + hr = WsRemoveMappedHeader( msg, &header, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -715,4 +749,5 @@ START_TEST(msg) test_WsSetHeader(); test_WsRemoveHeader(); test_WsAddMappedHeader(); + test_WsRemoveMappedHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index bdf6c3f..acf5167 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -129,7 +129,7 @@ @ stub WsRegisterOperationForCancel @ stub WsRemoveCustomHeader @ stdcall WsRemoveHeader(ptr long ptr) -@ stub WsRemoveMappedHeader +@ stdcall WsRemoveMappedHeader(ptr ptr ptr) @ stub WsRemoveNode @ stub WsRequestReply @ stub WsRequestSecurityToken

1 0

Hans Leidekker : webservices: Implement WsAddMappedHeader.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: ecd1fa8f0f28a2d507bd35b380e61a3b123f625b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd1fa8f0f28a2d507bd35b38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:24:01 2016 +0200 webservices: Implement WsAddMappedHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 96 +++++++++++++++++++++++++++++++++------ dlls/webservices/tests/msg.c | 35 ++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 117 insertions(+), 16 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 9a19622..e55e861 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -51,6 +51,8 @@ static const struct prop_desc msg_props[] = struct header { WS_HEADER_TYPE type; + WS_XML_STRING name; + BOOL mapped; WS_XML_UTF8_TEXT text; }; @@ -94,19 +96,20 @@ static struct msg *alloc_msg(void) return ret; } -static void free_headers( struct header **header, ULONG count ) +static void free_header( struct header *header ) { - ULONG i; - for (i = 0; i < count; i++) heap_free( header[i] ); + heap_free( header->name.bytes ); + heap_free( header ); } static void free_msg( struct msg *msg ) { + ULONG i; if (!msg) return; WsFreeWriter( msg->writer ); WsFreeHeap( msg->heap ); heap_free( msg->addr.chars ); - free_headers( msg->header, msg->header_count ); + for (i = 0; i < msg->header_count; i++) free_header( msg->header[i] ); heap_free( msg->header ); heap_free( msg ); } @@ -429,7 +432,7 @@ static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) for (i = 0; i < msg->header_count; i++) { - if ((hr = write_header( writer, msg->header[i] )) != S_OK) return hr; + if (!msg->header[i]->mapped && (hr = write_header( writer, msg->header[i] )) != S_OK) return hr; } if (msg->version_addr == WS_ADDRESSING_VERSION_0_9) @@ -571,8 +574,8 @@ static inline void set_utf8_text( WS_XML_UTF8_TEXT *text, BYTE *bytes, ULONG len text->value.length = len; } -static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_OPTION option, - const void *value, ULONG size, struct header **ret ) +static HRESULT alloc_header( WS_HEADER_TYPE type, const WS_XML_STRING *name, BOOL mapped, WS_TYPE value_type, + WS_WRITE_OPTION option, const void *value, ULONG size, struct header **ret ) { struct header *header; @@ -587,7 +590,7 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O src = *(const WCHAR **)value; len = WideCharToMultiByte( CP_UTF8, 0, src, -1, NULL, 0, NULL, NULL ) - 1; - if (!(header = heap_alloc( sizeof(*header) + len ))) return E_OUTOFMEMORY; + if (!(header = heap_alloc_zero( sizeof(*header) + len ))) return E_OUTOFMEMORY; set_utf8_text( &header->text, (BYTE *)(header + 1), len ); WideCharToMultiByte( CP_UTF8, 0, src, -1, (char *)header->text.value.bytes, len, NULL, NULL ); break; @@ -602,7 +605,7 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O return E_NOTIMPL; } if (size != sizeof(*str)) return E_INVALIDARG; - if (!(header = heap_alloc( sizeof(*header) + str->length ))) return E_OUTOFMEMORY; + if (!(header = heap_alloc_zero( sizeof(*header) + str->length ))) return E_OUTOFMEMORY; set_utf8_text( &header->text, (BYTE *)(header + 1), str->length ); memcpy( header->text.value.bytes, str->bytes, str->length ); break; @@ -619,7 +622,7 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O } if (size != sizeof(*str)) return E_INVALIDARG; len = WideCharToMultiByte( CP_UTF8, 0, str->chars, str->length, NULL, 0, NULL, NULL ); - if (!(header = heap_alloc( sizeof(*header) + len ))) return E_OUTOFMEMORY; + if (!(header = heap_alloc_zero( sizeof(*header) + len ))) return E_OUTOFMEMORY; set_utf8_text( &header->text, (BYTE *)(header + 1), len ); WideCharToMultiByte( CP_UTF8, 0, str->chars, str->length, (char *)header->text.value.bytes, len, NULL, NULL ); @@ -630,7 +633,19 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O return E_NOTIMPL; } - header->type = type; + if (name && name->length) + { + if (!(header->name.bytes = heap_alloc( name->length ))) + { + heap_free( header ); + return E_OUTOFMEMORY; + } + memcpy( header->name.bytes, name->bytes, name->length ); + header->name.length = name->length; + } + header->type = type; + header->mapped = mapped; + *ret = header; return S_OK; } @@ -662,8 +677,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val } } - if (found) heap_free( msg->header[i] ); - else + if (!found) { if (msg->header_count == msg->header_size) { @@ -676,7 +690,10 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val i = msg->header_count++; } - if ((hr = alloc_header( type, value_type, option, value, size, &header )) != S_OK) return hr; + if ((hr = alloc_header( type, NULL, FALSE, value_type, option, value, size, &header )) != S_OK) + return hr; + + if (found) free_header( msg->header[i] ); msg->header[i] = header; return write_envelope( msg ); } @@ -701,7 +718,7 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR { if (msg->header[i]->type == type) { - heap_free( msg->header[i] ); + free_header( msg->header[i] ); memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i) * sizeof(struct header *) ); msg->header_count--; removed = TRUE; @@ -712,3 +729,52 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR if (removed) return write_envelope( msg ); return S_OK; } + +/************************************************************************** + * WsAddMappedHeader [webservices.@] + */ +HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, WS_TYPE type, + WS_WRITE_OPTION option, const void *value, ULONG size , WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + struct header *header; + BOOL found = FALSE; + HRESULT hr; + ULONG i; + + TRACE( "%p %s %u %08x %p %u %p\n", handle, debugstr_xmlstr(name), type, option, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !name) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type || !msg->header[i]->mapped) continue; + if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK) + { + found = TRUE; + break; + } + } + + if (!found) + { + if (msg->header_count == msg->header_size) + { + struct header **tmp; + if (!(tmp = heap_realloc( msg->header, 2 * msg->header_size * sizeof(struct header *) ))) + return E_OUTOFMEMORY; + msg->header = tmp; + msg->header_size *= 2; + } + i = msg->header_count++; + } + + if ((hr = alloc_header( 0, name, TRUE, WS_XML_STRING_TYPE, option, value, size, &header )) != S_OK) + return hr; + + if (found) free_header( msg->header[i] ); + msg->header[i] = header; + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 5a0e8b2..1458488 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -669,6 +669,40 @@ static void test_WsRemoveHeader(void) WsFreeMessage( msg ); } +static void test_WsAddMappedHeader(void) +{ + static const WS_XML_STRING header = {6, (BYTE *)"Header"}, value = {5, (BYTE *)"value"}; + WS_MESSAGE *msg; + HRESULT hr; + + hr = WsAddMappedHeader( NULL, NULL, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, NULL, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, 0, 0, NULL, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* again */ + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -680,4 +714,5 @@ START_TEST(msg) test_WsWriteBody(); test_WsSetHeader(); test_WsRemoveHeader(); + test_WsAddMappedHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 59f9856..bdf6c3f 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -7,7 +7,7 @@ @ stub WsAcceptChannel @ stub WsAddCustomHeader @ stub WsAddErrorString -@ stub WsAddMappedHeader +@ stdcall WsAddMappedHeader(ptr ptr long long ptr long ptr) @ stdcall WsAddressMessage(ptr ptr ptr) @ stdcall WsAlloc(ptr long ptr ptr) @ stub WsAsyncExecute

1 0

Hans Leidekker : webservices: Validate the handle in channel functions.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 41da198a6eef85d20477e4d77c7f989f172e0fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=41da198a6eef85d20477e4d77… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:24:00 2016 +0200 webservices: Validate the handle in channel functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 5 ++++- dlls/webservices/tests/channel.c | 15 +++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index aba87c0..0277d51 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -188,6 +188,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); + if (!handle) return E_INVALIDARG; return prop_get( channel->prop, channel->prop_count, id, buf, size ); } @@ -202,6 +203,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID TRACE( "%p %u %p %u\n", handle, id, value, size ); if (error) FIXME( "ignoring error parameter\n" ); + if (!handle) return E_INVALIDARG; return prop_set( channel->prop, channel->prop_count, id, value, size ); } @@ -223,7 +225,7 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); - if (!endpoint) return E_INVALIDARG; + if (!handle || !endpoint) return E_INVALIDARG; if (channel->state != WS_CHANNEL_STATE_CREATED) return WS_E_INVALID_OPERATION; return open_channel( channel, endpoint ); @@ -246,5 +248,6 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); + if (!handle) return E_INVALIDARG; return close_channel( channel ); } diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index d85a151..f053c15 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -28,11 +28,11 @@ static void test_WsCreateChannel(void) WS_CHANNEL_STATE state; ULONG size, value; - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); channel = NULL; - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( channel != NULL, "channel not set\n" ); @@ -64,14 +64,14 @@ static void test_WsOpenChannel(void) WS_CHANNEL *channel; WS_ENDPOINT_ADDRESS addr; - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); WsFreeChannel( channel ); - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsOpenChannel( channel, NULL, NULL, NULL ); @@ -82,6 +82,9 @@ static void test_WsOpenChannel(void) addr.headers = NULL; addr.extensions = NULL; addr.identity = NULL; + hr = WsOpenChannel( NULL, &addr, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -93,6 +96,10 @@ static void test_WsOpenChannel(void) hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseChannel( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + WsFreeChannel( channel ); }

1 0

Hans Leidekker : webservices: Add support for writing GUID values.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: c06f2d4f5b03ab4866ebc7ceef05d9905a99bf33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c06f2d4f5b03ab4866ebc7cee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:23:59 2016 +0200 webservices: Add support for writing GUID values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 16 ++++++++++++++++ dlls/webservices/writer.c | 38 +++++++++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 65828a4..58a4544 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -580,6 +580,7 @@ static void test_basic_type(void) HRESULT hr; WS_XML_WRITER *writer; WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + GUID guid; ULONG i; static const struct { @@ -671,6 +672,21 @@ static void test_basic_type(void) check_output( writer, tests[i].result2, __LINE__ ); } + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &guid, 0, sizeof(guid) ); + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &guid, sizeof(guid), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>00000000-0000-0000-0000-000000000000</t>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 452ee46..1fb5489 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1497,6 +1497,23 @@ static HRESULT write_type_uint64( struct writer *writer, WS_TYPE_MAPPING mapping return write_type_text( writer, mapping, &utf8.text ); } +static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_GUID_DESCRIPTION *desc, const GUID *value ) +{ + WS_XML_UTF8_TEXT utf8; + unsigned char buf[37]; /* "00000000-0000-0000-0000-000000000000" */ + + if (desc) + { + FIXME( "description not supported\n" ); + return E_NOTIMPL; + } + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = buf; + utf8.value.length = format_guid( value, buf ); + return write_type_text( writer, mapping, &utf8.text ); +} + static HRESULT write_type_wsz( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_WSZ_DESCRIPTION *desc, const WCHAR *value ) { @@ -1664,14 +1681,14 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY } case WS_INT8_TYPE: { - const INT8 *ptr = value; + const INT8 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_int8( writer, mapping, desc, ptr ); } case WS_INT16_TYPE: { - const INT16 *ptr = value; + const INT16 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_int16( writer, mapping, desc, ptr ); @@ -1685,39 +1702,46 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY } case WS_INT64_TYPE: { - const INT64 *ptr = value; + const INT64 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_int64( writer, mapping, desc, ptr ); } case WS_UINT8_TYPE: { - const UINT8 *ptr = value; + const UINT8 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint8( writer, mapping, desc, ptr ); } case WS_UINT16_TYPE: { - const UINT16 *ptr = value; + const UINT16 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint16( writer, mapping, desc, ptr ); } case WS_UINT32_TYPE: { - const UINT32 *ptr = value; + const UINT32 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint32( writer, mapping, desc, ptr ); } case WS_UINT64_TYPE: { - const UINT64 *ptr = value; + const UINT64 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint64( writer, mapping, desc, ptr ); } + case WS_GUID_TYPE: + { + const GUID *ptr; + if (!option) option = WS_WRITE_REQUIRED_VALUE; + if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; + return write_type_guid( writer, mapping, desc, ptr ); + } case WS_WSZ_TYPE: { const WCHAR *ptr;

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 5ab0cecaca52d079a699e37bf72175f8aa45e008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab0cecaca52d079a699e37bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:23:58 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index cd30e4fc..53f851f 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -60,6 +60,7 @@ 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_UNIQUE_ID_DESCRIPTION WS_UNIQUE_ID_DESCRIPTION; typedef struct _WS_URL WS_URL; typedef struct _WS_HTTP_URL WS_HTTP_URL; typedef struct _WS_HTTPS_URL WS_HTTPS_URL; @@ -404,6 +405,15 @@ struct _WS_DOUBLE_DESCRIPTION { double maxValue; }; +struct _WS_GUID_DESCRIPTION { + GUID value; +}; + +struct _WS_UNIQUE_ID_DESCRIPTION { + ULONG minCharCount; + ULONG maxCharCount; +}; + typedef enum { WS_TYPE_ATTRIBUTE_FIELD_MAPPING, WS_ATTRIBUTE_FIELD_MAPPING, @@ -1336,6 +1346,8 @@ typedef enum typedef void (CALLBACK *WS_MESSAGE_DONE_CALLBACK) (void*); +HRESULT WINAPI WsAddMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_TYPE, WS_WRITE_OPTION, + const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsAddressMessage(WS_MESSAGE*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); HRESULT WINAPI WsAlloc(WS_HEAP*, SIZE_T, void**, WS_ERROR*); HRESULT WINAPI WsCall(WS_SERVICE_PROXY*, const WS_OPERATION_DESCRIPTION*, const void**, @@ -1421,6 +1433,7 @@ HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCR WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_ERROR*); +HRESULT WINAPI WsRemoveMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsResetChannel(WS_CHANNEL*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*);

1 0

Iván Matellanes : msvcirt: Implement Iostream_init constructor.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 1978c7d7169559f3ce48f9fe29867eb3c8707143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1978c7d7169559f3ce48f9fe2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 17 11:57:37 2016 +0100 msvcirt: Implement Iostream_init constructor. Signed-off-by: Iván Matellanes <matellanesivan(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 | 8 +++- dlls/msvcirt/tests/msvcirt.c | 109 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6cc8f1c..4597060 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4037,7 +4037,13 @@ iostream* __thiscall iostream_scalar_dtor(ios *base, unsigned int flags) DEFINE_THISCALL_WRAPPER(Iostream_init_ios_ctor, 12) void* __thiscall Iostream_init_ios_ctor(void *this, ios *obj, int n) { - FIXME("(%p %p %d) stub\n", this, obj, n); + TRACE("(%p %p %d)\n", this, obj, n); + obj->delbuf = 1; + if (n >= 0) { + obj->tie = NULL; /* FIXME: tie to cout */ + if (n > 0) + ios_setf(obj, FLAGS_unitbuf); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 9750d88..dcab485 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -383,6 +383,12 @@ static void (*__thiscall p_iostream_vbase_dtor)(iostream*); static iostream* (*__thiscall p_iostream_assign_sb)(iostream*, streambuf*); static iostream* (*__thiscall p_iostream_assign)(iostream*, const iostream*); +/* Iostream_init */ +static void* (*__thiscall p_Iostream_init_ios_ctor)(void*, ios*, int); + +/* Predefined streams */ +static ostream *p_cout; + /* Emulate a __thiscall */ #ifdef __i386__ @@ -635,6 +641,8 @@ static BOOL init(void) SET(p_iostream_vbase_dtor, "??_Diostream@@QEAAXXZ"); SET(p_iostream_assign_sb, "??4iostream@@IEAAAEAV0@PEAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IEAAAEAV0@AEAV0@@Z"); + + SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QEAA@AEAVios@@H@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3@YAXPAX@Z"); @@ -810,6 +818,8 @@ static BOOL init(void) SET(p_iostream_vbase_dtor, "??_Diostream@@QAEXXZ"); SET(p_iostream_assign_sb, "??4iostream@@IAEAAV0@PAVstreambuf@@@Z"); SET(p_iostream_assign, "??4iostream@@IAEAAV0@AAV0@@Z"); + + SET(p_Iostream_init_ios_ctor, "??0Iostream_init@@QAE@AAVios@@H@Z"); } SET(p_ios_static_lock, "?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc@ios@@KAXXZ"); @@ -820,6 +830,7 @@ static BOOL init(void) SET(p_ios_statebuf, "?x_statebuf@ios@@0PAJA"); SET(p_ios_xalloc, "?xalloc@ios@@SAHXZ"); SET(p_ios_fLockcInit, "?fLockcInit@ios@@0HA"); + SET(p_cout, "?cout@@3Vostream_withassign@@A"); init_thiscall_thunk(); return TRUE; @@ -6032,6 +6043,103 @@ static void test_iostream(void) ok(ios2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base_ios.do_lock); } +static void test_Iostream_init(void) +{ + ios ios_obj; + ostream *pos; + streambuf *psb; + void *pinit; + + memset(&ios_obj, 0xab, sizeof(ios)); + psb = ios_obj.sb; + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, &ios_obj, 0); + ok(pinit == NULL, "wrong return, expected %p got %p\n", NULL, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); +todo_wine + ok(ios_obj.tie == p_cout, "expected %p got %p\n", p_cout, ios_obj.tie); + ok(ios_obj.flags == 0xabababab, "expected %d got %x\n", 0xabababab, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.do_lock); + + memset(&ios_obj, 0xab, sizeof(ios)); + pos = ios_obj.tie; + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, &ios_obj, -1); + ok(pinit == NULL, "wrong return, expected %p got %p\n", NULL, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); + ok(ios_obj.tie == pos, "expected %p got %p\n", pos, ios_obj.tie); + ok(ios_obj.flags == 0xabababab, "expected %d got %x\n", 0xabababab, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.do_lock); + + memset(&ios_obj, 0xab, sizeof(ios)); + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, &ios_obj, -100); + ok(pinit == NULL, "wrong return, expected %p got %p\n", NULL, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); + ok(ios_obj.tie == pos, "expected %p got %p\n", pos, ios_obj.tie); + ok(ios_obj.flags == 0xabababab, "expected %d got %x\n", 0xabababab, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.do_lock); + + if (0) /* crashes on native */ + pinit = call_func3(p_Iostream_init_ios_ctor, NULL, NULL, -1); + + memset(&ios_obj, 0xab, sizeof(ios)); + ios_obj.flags = 0xcdcdcdcd; + ios_obj.do_lock = 0x34343434; + pinit = call_func3(p_Iostream_init_ios_ctor, (void*) 0xdeadbeef, &ios_obj, 1); + ok(pinit == (void*) 0xdeadbeef, "wrong return, expected %p got %p\n", (void*) 0xdeadbeef, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); +todo_wine + ok(ios_obj.tie == p_cout, "expected %p got %p\n", p_cout, ios_obj.tie); + ok(ios_obj.flags == (0xcdcdcdcd|FLAGS_unitbuf), "expected %d got %x\n", + 0xcdcdcdcd|FLAGS_unitbuf, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0x34343434, "expected %d got %d\n", 0x34343434, ios_obj.do_lock); + + memset(&ios_obj, 0xab, sizeof(ios)); + ios_obj.flags = 0xcdcdcdcd; + ios_obj.do_lock = 0x34343434; + pinit = call_func3(p_Iostream_init_ios_ctor, (void*) 0xabababab, &ios_obj, 5); + ok(pinit == (void*) 0xabababab, "wrong return, expected %p got %p\n", (void*) 0xabababab, pinit); + ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); + ok(ios_obj.state == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.state); + ok(ios_obj.special[0] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[0]); + ok(ios_obj.special[1] == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.special[1]); + ok(ios_obj.delbuf == 1, "expected 1 got %d\n", ios_obj.delbuf); +todo_wine + ok(ios_obj.tie == p_cout, "expected %p got %p\n", p_cout, ios_obj.tie); + ok(ios_obj.flags == (0xcdcdcdcd|FLAGS_unitbuf), "expected %d got %x\n", + 0xcdcdcdcd|FLAGS_unitbuf, ios_obj.flags); + ok(ios_obj.precision == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.precision); + ok(ios_obj.fill == (char) 0xab, "expected -85 got %d\n", ios_obj.fill); + ok(ios_obj.width == 0xabababab, "expected %d got %d\n", 0xabababab, ios_obj.width); + ok(ios_obj.do_lock == 0x34343434, "expected %d got %d\n", 0x34343434, ios_obj.do_lock); +} + START_TEST(msvcirt) { if(!init()) @@ -6051,6 +6159,7 @@ START_TEST(msvcirt) test_istream_read(); test_istream_withassign(); test_iostream(); + test_Iostream_init(); FreeLibrary(msvcrt); FreeLibrary(msvcirt);

1 0

Iván Matellanes : msvcirt: Add a partial implementation of class Iostream_init.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 5981a3279ba5c03ad86b159d9ee4135ecdae871e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5981a3279ba5c03ad86b159d9… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 17 11:57:36 2016 +0100 msvcirt: Add a partial implementation of class Iostream_init. Signed-off-by: Iván Matellanes <matellanesivan(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 | 35 +++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 16 ++++++++-------- dlls/msvcrt20/msvcrt20.spec | 16 ++++++++-------- dlls/msvcrt40/msvcrt40.spec | 16 ++++++++-------- 4 files changed, 59 insertions(+), 24 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index fd721b5..6cc8f1c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4032,6 +4032,41 @@ iostream* __thiscall iostream_scalar_dtor(ios *base, unsigned int flags) return this; } +/* ??0Iostream_init@@QAE@AAVios@@H@Z */ +/* ??0Iostream_init@@QEAA@AEAVios@@H@Z */ +DEFINE_THISCALL_WRAPPER(Iostream_init_ios_ctor, 12) +void* __thiscall Iostream_init_ios_ctor(void *this, ios *obj, int n) +{ + FIXME("(%p %p %d) stub\n", this, obj, n); + return this; +} + +/* ??0Iostream_init@@QAE@XZ */ +/* ??0Iostream_init@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(Iostream_init_ctor, 4) +void* __thiscall Iostream_init_ctor(void *this) +{ + TRACE("(%p)\n", this); + return this; +} + +/* ??1Iostream_init@@QAE@XZ */ +/* ??1Iostream_init@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(Iostream_init_dtor, 4) +void __thiscall Iostream_init_dtor(void *this) +{ + TRACE("(%p)\n", this); +} + +/* ??4Iostream_init@@QAEAAV0@ABV0@@Z */ +/* ??4Iostream_init@@QEAAAEAV0@AEBV0@@Z */ +DEFINE_THISCALL_WRAPPER(Iostream_init_assign, 8) +void* __thiscall Iostream_init_assign(void *this, const void *rhs) +{ + TRACE("(%p %p)\n", this, rhs); + return this; +} + /****************************************************************** * ??0ostrstream@@QAE@XZ (MSVCRTI.@) */ diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 8361896..7b67bc7 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -1,7 +1,7 @@ -@ stub -arch=win32 ??0Iostream_init@@QAE@AAVios@@H@Z # __thiscall Iostream_init::Iostream_init(class ios &,int) -@ stub -arch=win64 ??0Iostream_init@@QEAA@AEAVios@@H@Z -@ stub -arch=win32 ??0Iostream_init@@QAE@XZ # __thiscall Iostream_init::Iostream_init(void) -@ stub -arch=win64 ??0Iostream_init@@QEAA@XZ +@ thiscall -arch=win32 ??0Iostream_init@@QAE@AAVios@@H@Z(ptr ptr long) Iostream_init_ios_ctor +@ cdecl -arch=win64 ??0Iostream_init@@QEAA@AEAVios@@H@Z(ptr ptr long) Iostream_init_ios_ctor +@ thiscall -arch=win32 ??0Iostream_init@@QAE@XZ(ptr) Iostream_init_ctor +@ cdecl -arch=win64 ??0Iostream_init@@QEAA@XZ(ptr) Iostream_init_ctor @ thiscall -arch=i386 ??0exception@@QAE@ABQBD@Z(ptr ptr) MSVCP_exception_ctor @ cdecl -arch=win64 ??0exception@@QEAA@AEBQEBD@Z(ptr ptr) MSVCP_exception_ctor @ thiscall -arch=i386 ??0exception@@QAE@ABV0@@Z(ptr ptr) MSVCP_exception_copy_ctor @@ -130,8 +130,8 @@ @ cdecl -arch=win64 ??0strstreambuf@@QEAA@PEAEH0@Z(ptr ptr long ptr) strstreambuf_ubuffer_ctor @ thiscall -arch=win32 ??0strstreambuf@@QAE@XZ(ptr) strstreambuf_ctor @ cdecl -arch=win64 ??0strstreambuf@@QEAA@XZ(ptr) strstreambuf_ctor -@ stub -arch=win32 ??1Iostream_init@@QAE@XZ # __thiscall Iostream_init::~Iostream_init(void) -@ stub -arch=win64 ??1Iostream_init@@QEAA@XZ +@ thiscall -arch=win32 ??1Iostream_init@@QAE@XZ(ptr) Iostream_init_dtor +@ cdecl -arch=win64 ??1Iostream_init@@QEAA@XZ(ptr) Iostream_init_dtor @ thiscall -arch=i386 ??1exception@@UAE@XZ(ptr) MSVCP_exception_dtor @ cdecl -arch=win64 ??1exception@@UEAA@XZ(ptr) MSVCP_exception_dtor @ thiscall -arch=win32 ??1filebuf@@UAE@XZ(ptr) filebuf_dtor @@ -170,8 +170,8 @@ @ stub -arch=win64 ??1strstream@@UEAA@XZ @ thiscall -arch=win32 ??1strstreambuf@@UAE@XZ(ptr) strstreambuf_dtor @ cdecl -arch=win64 ??1strstreambuf@@UEAA@XZ(ptr) strstreambuf_dtor -@ stub -arch=win32 ??4Iostream_init@@QAEAAV0@ABV0@@Z # class Iostream_init & __thiscall Iostream_init::operator=(class Iostream_init const &) -@ stub -arch=win64 ??4Iostream_init@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4Iostream_init@@QAEAAV0@ABV0@@Z(ptr ptr) Iostream_init_assign +@ cdecl -arch=win64 ??4Iostream_init@@QEAAAEAV0@AEBV0@@Z(ptr ptr) Iostream_init_assign @ thiscall -arch=i386 ??4exception@@QAEAAV0@ABV0@@Z(ptr ptr) MSVCP_exception_assign @ cdecl -arch=win64 ??4exception@@QEAAAEAV0@AEBV0@@Z(ptr ptr) MSVCP_exception_assign @ thiscall -arch=win32 ??4filebuf@@QAEAAV0@ABV0@@Z(ptr ptr) filebuf_assign diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 86d1120..fad156b 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -1,7 +1,7 @@ -@ stub -arch=win32 ??0Iostream_init@@QAE@AAVios@@H@Z -@ stub -arch=win64 ??0Iostream_init@@QEAA@AEAVios@@H@Z -@ stub -arch=win32 ??0Iostream_init@@QAE@XZ -@ stub -arch=win64 ??0Iostream_init@@QEAA@XZ +@ thiscall -arch=win32 ??0Iostream_init@@QAE@AAVios@@H@Z(ptr ptr long) msvcirt.??0Iostream_init@@QAE@AAVios@@H@Z +@ cdecl -arch=win64 ??0Iostream_init@@QEAA@AEAVios@@H@Z(ptr ptr long) msvcirt.??0Iostream_init@@QEAA@AEAVios@@H@Z +@ thiscall -arch=win32 ??0Iostream_init@@QAE@XZ(ptr) msvcirt.??0Iostream_init@@QAE@XZ +@ cdecl -arch=win64 ??0Iostream_init@@QEAA@XZ(ptr) msvcirt.??0Iostream_init@@QEAA@XZ @ thiscall -arch=win32 ??0filebuf@@QAE@ABV0@@Z(ptr ptr) msvcirt.??0filebuf@@QAE@ABV0@@Z @ cdecl -arch=win64 ??0filebuf@@QEAA@AEBV0@@Z(ptr ptr) msvcirt.??0filebuf@@QEAA@AEBV0@@Z @ thiscall -arch=win32 ??0filebuf@@QAE@H@Z(ptr long) msvcirt.??0filebuf@@QAE@H@Z @@ -118,8 +118,8 @@ @ cdecl -arch=win64 ??0strstreambuf@@QEAA@PEADH0@Z(ptr ptr long ptr) msvcirt.??0strstreambuf@@QEAA@PEADH0@Z @ thiscall -arch=win32 ??0strstreambuf@@QAE@XZ(ptr) msvcirt.??0strstreambuf@@QAE@XZ @ cdecl -arch=win64 ??0strstreambuf@@QEAA@XZ(ptr) msvcirt.??0strstreambuf@@QEAA@XZ -@ stub -arch=win32 ??1Iostream_init@@QAE@XZ -@ stub -arch=win64 ??1Iostream_init@@QEAA@XZ +@ thiscall -arch=win32 ??1Iostream_init@@QAE@XZ(ptr) msvcirt.??1Iostream_init@@QAE@XZ +@ cdecl -arch=win64 ??1Iostream_init@@QEAA@XZ(ptr) msvcirt.??1Iostream_init@@QEAA@XZ @ thiscall -arch=win32 ??1filebuf@@UAE@XZ(ptr) msvcirt.??1filebuf@@UAE@XZ @ cdecl -arch=win64 ??1filebuf@@UEAA@XZ(ptr) msvcirt.??1filebuf@@UEAA@XZ @ stub -arch=win32 ??1fstream@@UAE@XZ @@ -158,8 +158,8 @@ @ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) msvcrt.??2@YAPEAX_K@Z @ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) msvcrt.??3@YAXPAX@Z @ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) msvcrt.??3@YAXPEAX@Z -@ stub -arch=win32 ??4Iostream_init@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4Iostream_init@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4Iostream_init@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4Iostream_init@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4filebuf@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4filebuf@@QAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4filebuf@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4filebuf@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4fstream@@QAEAAV0@AAV0@@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index e78f085..4ac328a 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -1,7 +1,7 @@ -@ stub -arch=win32 ??0Iostream_init@@QAE@AAVios@@H@Z -@ stub -arch=win64 ??0Iostream_init@@QEAA@AEAVios@@H@Z -@ stub -arch=win32 ??0Iostream_init@@QAE@XZ -@ stub -arch=win64 ??0Iostream_init@@QEAA@XZ +@ thiscall -arch=win32 ??0Iostream_init@@QAE@AAVios@@H@Z(ptr ptr long) msvcirt.??0Iostream_init@@QAE@AAVios@@H@Z +@ cdecl -arch=win64 ??0Iostream_init@@QEAA@AEAVios@@H@Z(ptr ptr long) msvcirt.??0Iostream_init@@QEAA@AEAVios@@H@Z +@ thiscall -arch=win32 ??0Iostream_init@@QAE@XZ(ptr) msvcirt.??0Iostream_init@@QAE@XZ +@ cdecl -arch=win64 ??0Iostream_init@@QEAA@XZ(ptr) msvcirt.??0Iostream_init@@QEAA@XZ @ thiscall -arch=i386 ??0__non_rtti_object@@QAE@ABV0@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE@ABV0@@Z @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QEAA@AEBV0@@Z @ thiscall -arch=i386 ??0__non_rtti_object@@QAE@PBD@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE@PBD@Z @@ -140,8 +140,8 @@ @ cdecl -arch=win64 ??0strstreambuf@@QEAA@PEADH0@Z(ptr ptr long ptr) msvcirt.??0strstreambuf@@QEAA@PEADH0@Z @ thiscall -arch=win32 ??0strstreambuf@@QAE@XZ(ptr) msvcirt.??0strstreambuf@@QAE@XZ @ cdecl -arch=win64 ??0strstreambuf@@QEAA@XZ(ptr) msvcirt.??0strstreambuf@@QEAA@XZ -@ stub -arch=win32 ??1Iostream_init@@QAE@XZ -@ stub -arch=win64 ??1Iostream_init@@QEAA@XZ +@ thiscall -arch=win32 ??1Iostream_init@@QAE@XZ(ptr) msvcirt.??1Iostream_init@@QAE@XZ +@ cdecl -arch=win64 ??1Iostream_init@@QEAA@XZ(ptr) msvcirt.??1Iostream_init@@QEAA@XZ @ thiscall -arch=i386 ??1__non_rtti_object@@UAE@XZ(ptr) msvcrt.??1__non_rtti_object@@UAE@XZ @ cdecl -arch=win64 ??1__non_rtti_object@@UEAA@XZ(ptr) msvcrt.??1__non_rtti_object@@UEAA@XZ @ thiscall -arch=i386 ??1bad_cast@@UAE@XZ(ptr) msvcrt.??1bad_cast@@UAE@XZ @@ -192,8 +192,8 @@ @ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) msvcrt.??2@YAPEAX_K@Z @ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) msvcrt.??3@YAXPAX@Z @ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) msvcrt.??3@YAXPEAX@Z -@ stub -arch=win32 ??4Iostream_init@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4Iostream_init@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4Iostream_init@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4Iostream_init@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4Iostream_init@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=i386 ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=i386 ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0@ABV0@@Z

1 0

Piotr Caban : msvcrt: Add _wcreate_locale.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: dd4c9358f672f878610f1dc11e3114c07d6b2385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4c9358f672f878610f1dc11… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 13:17:17 2016 +0200 msvcrt: Add _wcreate_locale. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-locale-l1-1-0.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 49 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/locale.c | 25 +++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index c7e5aae..60c588b 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl _lock_locales() ucrtbase._lock_locales @ cdecl _setmbcp(long) ucrtbase._setmbcp @ cdecl _unlock_locales() ucrtbase._unlock_locales -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) ucrtbase._wcreate_locale @ cdecl _wsetlocale(long wstr) ucrtbase._wsetlocale @ cdecl localeconv() ucrtbase.localeconv @ cdecl setlocale(long str) ucrtbase.setlocale diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5f33acf..1890a13 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1844,7 +1844,7 @@ @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ extern _wcmdln MSVCRT__wcmdln @ cdecl _wcreat(wstr long) MSVCRT__wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 953cdba..66334d8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1862,7 +1862,7 @@ @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ extern _wcmdln MSVCRT__wcmdln @ cdecl _wcreat(wstr long) MSVCRT__wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 25330f1..4ecea51 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -170,6 +170,8 @@ static double (CDECL *p_remainder)(double, double); static int* (CDECL *p_errno)(void); static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p__clearfp)(void); +static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); +static void (__cdecl *p_free_locale)(_locale_t); /* make sure we use the correct errno */ #undef errno @@ -215,6 +217,8 @@ static BOOL init(void) p_wcstof = (void*)GetProcAddress(module, "wcstof"); p_remainder = (void*)GetProcAddress(module, "remainder"); p_errno = (void*)GetProcAddress(module, "_errno"); + p_wcreate_locale = (void*)GetProcAddress(module, "_wcreate_locale"); + p_free_locale = (void*)GetProcAddress(module, "_free_locale"); SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); if(sizeof(void*) == 8) { /* 64-bit initialization */ @@ -710,6 +714,50 @@ static void test_fegetenv(void) ok(!env.status, "env.status = %x\n", env.status); } +static void test__wcreate_locale(void) +{ + static const wchar_t c_locale[] = {'C',0}; + static const wchar_t bogus[] = {'b','o','g','u','s',0}; + static const wchar_t empty[] = {0}; + _locale_t lcl; + errno_t e; + + /* simple success */ + errno = -1; + lcl = p_wcreate_locale(LC_ALL, c_locale); + e = errno; + ok(!!lcl, "expected success, but got NULL\n"); + ok(errno == -1, "expected errno -1, but got %i\n", e); + p_free_locale(lcl); + + errno = -1; + lcl = p_wcreate_locale(LC_ALL, empty); + e = errno; + ok(!!lcl, "expected success, but got NULL\n"); + ok(errno == -1, "expected errno -1, but got %i\n", e); + p_free_locale(lcl); + + /* bogus category */ + errno = -1; + lcl = p_wcreate_locale(-1, c_locale); + e = errno; + ok(!lcl, "expected failure, but got %p\n", lcl); + ok(errno == -1, "expected errno -1, but got %i\n", e); + + /* bogus names */ + errno = -1; + lcl = p_wcreate_locale(LC_ALL, bogus); + e = errno; + ok(!lcl, "expected failure, but got %p\n", lcl); + ok(errno == -1, "expected errno -1, but got %i\n", e); + + errno = -1; + lcl = p_wcreate_locale(LC_ALL, NULL); + e = errno; + ok(!lcl, "expected failure, but got %p\n", lcl); + ok(errno == -1, "expected errno -1, but got %i\n", e); +} + START_TEST(msvcr120) { if (!init()) return; @@ -724,4 +772,5 @@ START_TEST(msvcr120) test_remainder(); test_critical_section(); test_fegetenv(); + test__wcreate_locale(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c88cde0..6f0daca 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1555,7 +1555,7 @@ @ cdecl _wchmod(wstr long) msvcr120._wchmod @ extern _wcmdln msvcr120._wcmdln @ cdecl _wcreat(wstr long) msvcr120._wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) msvcr120._wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) msvcr120._wcscoll_l @ cdecl _wcsdup(wstr) msvcr120._wcsdup @ cdecl _wcserror(long) msvcr120._wcserror diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 024ec99..c3e5630 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1634,6 +1634,31 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } /********************************************************************* + * _wcreate_locale (MSVCRT.@) + */ +MSVCRT__locale_t CDECL MSVCRT__wcreate_locale(int category, const MSVCRT_wchar_t *locale) +{ + MSVCRT__locale_t loc; + MSVCRT_size_t len; + char *str; + + if(category<MSVCRT_LC_MIN || category>MSVCRT_LC_MAX || !locale) + return NULL; + + len = MSVCRT_wcstombs(NULL, locale, 0); + if(len == -1) + return NULL; + if(!(str = MSVCRT_malloc(++len))) + return NULL; + MSVCRT_wcstombs(str, locale, len); + + loc = MSVCRT__create_locale(category, str); + + MSVCRT_free(str); + return loc; +} + +/********************************************************************* * setlocale (MSVCRT.@) */ char* CDECL MSVCRT_setlocale(int category, const char* locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1adc80a..0e1faa1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2011,7 +2011,7 @@ @ cdecl _wchdir(wstr) MSVCRT__wchdir @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ cdecl _wcreat(wstr long) MSVCRT__wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror

1 0

Daniel Lehman : ucrtbase: Add __stdio_common_vfwscanf.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: 48340bd1fea772d0c3539edc693135ce800d4aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=48340bd1fea772d0c3539edc6… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 8 14:02:16 2016 -0700 ucrtbase: Add __stdio_common_vfwscanf. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index d52c0d4..0dc03b8 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -8,7 +8,7 @@ @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s -@ stub __stdio_common_vfwscanf +@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 8c9cd87..579dec5 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -683,6 +683,23 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, } /********************************************************************* + * __stdio_common_vfwscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, + MSVCRT_FILE *file, + const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + if (options & ~UCRTBASE_SCANF_SECURECRT) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + if (options & UCRTBASE_SCANF_SECURECRT) + return MSVCRT_vfwscanf_s_l(file, format, locale, valist); + else + return MSVCRT_vfwscanf_l(file, format, locale, valist); +} + +/********************************************************************* * _snwscanf (MSVCRT.@) */ int CDECL MSVCRT__snwscanf(MSVCRT_wchar_t *input, MSVCRT_size_t length, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ed985d2..1adc80a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -153,7 +153,7 @@ @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s -@ stub __stdio_common_vfwscanf +@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf

1 0

Alistair Leslie-Hughes : inetcomm: Add MimeOleObjectFromMoniker stub.
by Alexandre Julliard 17 Aug '16

17 Aug '16

Module: wine Branch: master Commit: c40001cdc44aad5d31ae2b3bd28c1d58f2234393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40001cdc44aad5d31ae2b3bd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 15 20:53:45 2016 +0000 inetcomm: Add MimeOleObjectFromMoniker stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/mimeole.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index bfd115c..439a409 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -82,7 +82,7 @@ @ stdcall MimeOleGetPropertySchema(ptr) @ stub MimeOleGetRelatedSection @ stub MimeOleInetDateToFileTime -@ stub MimeOleObjectFromMoniker +@ stdcall MimeOleObjectFromMoniker(long ptr ptr ptr ptr ptr) @ stub MimeOleOpenFileStream @ stub MimeOleParseMhtmlUrl @ stub MimeOleParseRfc822Address diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6046c74..e1e10bd 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3436,3 +3436,11 @@ HRESULT WINAPI MimeGetAddressFormatW(REFIID riid, void *object, DWORD addr_type, return E_NOTIMPL; } + +HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx *binding, + REFIID riid, void **out, IMoniker **moniker_new) +{ + FIXME("(0x%08x, %p, %p, %s, %p, %p) stub\n", bindf, moniker, binding, debugstr_guid(riid), out, moniker_new); + + return E_NOTIMPL; +}

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016