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

Hans Leidekker : webservices: Avoid a warning from HeapDestroy.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: ab2f25d40c4e72b8f156af43e615c028bd268db4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab2f25d40c4e72b8f156af43… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 15:04:44 2018 +0200 webservices: Avoid a warning from HeapDestroy. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 5e1a273..e44cf72 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -216,7 +216,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR static void reset_heap( struct heap *heap ) { - HeapDestroy( heap->handle ); + if (heap->handle) HeapDestroy( heap->handle ); heap->handle = NULL; heap->max_size = heap->allocated = 0; }

1 0

Hans Leidekker : webservices: Avoid accessing the old user buffer in WsSetOutput/ToBuffer.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: e222e88ac423ebe4e1c89b8486c2ff3b2d73e2bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e222e88ac423ebe4e1c89b84… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 15:04:45 2018 +0200 webservices: Avoid accessing the old user buffer in WsSetOutput/ToBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 9cba4e6..33c1be7 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -39,7 +39,7 @@ static const struct prop_desc writer_props[] = { { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_DEPTH */ { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT */ - { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_ATTRIBUTES */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_ATTRIBUTES */ { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_WRITE_DECLARATION */ { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_INDENT */ { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE */ @@ -85,6 +85,7 @@ struct writer WS_CHARSET output_charset; WS_XML_WRITER_OUTPUT_TYPE output_type; struct xmlbuf *output_buf; + BOOL output_buf_user; WS_HEAP *output_heap; const WS_XML_DICTIONARY *dict; BOOL dict_do_lookup; @@ -332,7 +333,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT static void set_output_buffer( struct writer *writer, struct xmlbuf *xmlbuf ) { /* free current buffer if it's ours */ - if (writer->output_buf && writer->output_buf->heap == writer->output_heap) + if (writer->output_buf && !writer->output_buf_user) { free_xmlbuf( writer->output_buf ); } @@ -419,6 +420,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING goto done; } set_output_buffer( writer, xmlbuf ); + writer->output_buf_user = FALSE; break; } default: @@ -472,6 +474,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer writer->output_enc = xmlbuf->encoding; writer->output_charset = xmlbuf->charset; set_output_buffer( writer, xmlbuf ); + writer->output_buf_user = TRUE; if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) hr = E_OUTOFMEMORY; else write_insert_bof( writer, node );

1 0

Hans Leidekker : webservices: Implement WsShutdownSessionChannel.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 8355a96dd3d55e6253cbb281214ab8ba7eb2cd2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8355a96dd3d55e6253cbb281… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 15:04:46 2018 +0200 webservices: Implement WsShutdownSessionChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 98 +++++++++++++++++++++++++++++---------- dlls/webservices/tests/channel.c | 12 +++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 87 insertions(+), 26 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 685e13d..6c7c8af 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -193,6 +193,7 @@ enum session_state { SESSION_STATE_UNINITIALIZED, SESSION_STATE_SETUP_COMPLETE, + SESSION_STATE_SHUTDOWN, }; struct channel @@ -664,6 +665,78 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return hr; } +enum frame_record_type +{ + FRAME_RECORD_TYPE_VERSION, + FRAME_RECORD_TYPE_MODE, + FRAME_RECORD_TYPE_VIA, + FRAME_RECORD_TYPE_KNOWN_ENCODING, + FRAME_RECORD_TYPE_EXTENSIBLE_ENCODING, + FRAME_RECORD_TYPE_UNSIZED_ENVELOPE, + FRAME_RECORD_TYPE_SIZED_ENVELOPE, + FRAME_RECORD_TYPE_END, + FRAME_RECORD_TYPE_FAULT, + FRAME_RECORD_TYPE_UPGRADE_REQUEST, + FRAME_RECORD_TYPE_UPGRADE_RESPONSE, + FRAME_RECORD_TYPE_PREAMBLE_ACK, + FRAME_RECORD_TYPE_PREAMBLE_END, +}; + +static HRESULT send_byte( SOCKET socket, BYTE byte ) +{ + int count = send( socket, (char *)&byte, 1, 0 ); + if (count < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); + if (count != 1) return WS_E_OTHER; + return S_OK; +} + +static HRESULT shutdown_session( struct channel *channel ) +{ + HRESULT hr; + + if (channel->state != WS_CHANNEL_STATE_OPEN || + (channel->type != WS_CHANNEL_TYPE_OUTPUT_SESSION && + channel->type != WS_CHANNEL_TYPE_DUPLEX_SESSION) || + channel->session_state >= SESSION_STATE_SHUTDOWN) return WS_E_INVALID_OPERATION; + + switch (channel->binding) + { + case WS_TCP_CHANNEL_BINDING: + if ((hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_END )) != S_OK) return hr; + channel->session_state = SESSION_STATE_SHUTDOWN; + return S_OK; + + default: + FIXME( "unhandled binding %u\n", channel->binding ); + return E_NOTIMPL; + } +} + +HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + HRESULT hr; + + TRACE( "%p %p %p\n", handle, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + if (!channel) return E_INVALIDARG; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + hr = shutdown_session( channel ); + + LeaveCriticalSection( &channel->cs ); + return hr; +} + static void close_channel( struct channel *channel ) { reset_channel( channel ); @@ -913,14 +986,6 @@ static HRESULT send_message_http( HINTERNET request, BYTE *data, ULONG len ) return S_OK; } -static HRESULT send_byte( SOCKET socket, BYTE byte ) -{ - int count = send( socket, (char *)&byte, 1, 0 ); - if (count < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); - if (count != 1) return WS_E_OTHER; - return S_OK; -} - static HRESULT send_bytes( SOCKET socket, BYTE *bytes, int len ) { int count = send( socket, (char *)bytes, len, 0 ); @@ -944,23 +1009,6 @@ static HRESULT send_size( SOCKET socket, ULONG size ) return E_INVALIDARG; } -enum frame_record_type -{ - FRAME_RECORD_TYPE_VERSION, - FRAME_RECORD_TYPE_MODE, - FRAME_RECORD_TYPE_VIA, - FRAME_RECORD_TYPE_KNOWN_ENCODING, - FRAME_RECORD_TYPE_EXTENSIBLE_ENCODING, - FRAME_RECORD_TYPE_UNSIZED_ENVELOPE, - FRAME_RECORD_TYPE_SIZED_ENVELOPE, - FRAME_RECORD_TYPE_END, - FRAME_RECORD_TYPE_FAULT, - FRAME_RECORD_TYPE_UPGRADE_REQUEST, - FRAME_RECORD_TYPE_UPGRADE_RESPONSE, - FRAME_RECORD_TYPE_PREAMBLE_ACK, - FRAME_RECORD_TYPE_PREAMBLE_END, -}; - static inline ULONG size_length( ULONG size ) { if (size < 0x80) return 1; diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index c995a08..db17893 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -496,6 +496,9 @@ static void test_message_read_write( const struct listener_info *info ) hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -627,6 +630,9 @@ static void test_duplex_session( const struct listener_info *info ) hr = WsCreateChannel( info->type, info->binding, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + memset( &addr, 0, sizeof(addr) ); addr.url.length = wsprintfW( buf, fmt, info->port ); addr.url.chars = buf; @@ -655,6 +661,12 @@ static void test_duplex_session( const struct listener_info *info ) err = WaitForSingleObject( info->wait, 3000 ); ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsShutdownSessionChannel( channel, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 55f3e2e..8ba34b4 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -158,7 +158,7 @@ @ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr) @ stdcall WsSetReaderPosition(ptr ptr ptr) @ stdcall WsSetWriterPosition(ptr ptr ptr) -@ stub WsShutdownSessionChannel +@ stdcall WsShutdownSessionChannel(ptr ptr ptr) @ stdcall WsSkipNode(ptr ptr) @ stub WsStartReaderCanonicalization @ stub WsStartWriterCanonicalization diff --git a/include/webservices.h b/include/webservices.h index 1f823dd..928819f 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1732,6 +1732,7 @@ HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_ ULONG, WS_ERROR*); HRESULT WINAPI WsSetReaderPosition(WS_XML_READER*, const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsSetWriterPosition(WS_XML_WRITER*, const WS_XML_NODE_POSITION*, WS_ERROR*); +HRESULT WINAPI WsShutdownSessionChannel(WS_CHANNEL*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSkipNode(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsWriteArray(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, WS_VALUE_TYPE, const void*, ULONG, ULONG, ULONG, WS_ERROR*);

1 0

Hans Leidekker : webservices: Use the static dictionary only while writing the message header.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: d120f7f8418f32285e3ccc71d5778aa6ce3a60be URL: https://source.winehq.org/git/wine.git/?a=commit;h=d120f7f8418f32285e3ccc71… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 15:04:47 2018 +0200 webservices: Use the static dictionary only while writing the message header. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 30 ++++++++++++++---------------- dlls/webservices/webservices_private.h | 2 +- dlls/webservices/writer.c | 4 ++-- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 6c7c8af..79d431f 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -967,15 +967,6 @@ static HRESULT connect_channel( struct channel *channel ) } } -static HRESULT write_message( WS_MESSAGE *handle, WS_XML_WRITER *writer, const WS_ELEMENT_DESCRIPTION *desc, - WS_WRITE_OPTION option, const void *body, ULONG size ) -{ - HRESULT hr; - if ((hr = WsWriteEnvelopeStart( handle, writer, NULL, NULL, NULL )) != S_OK) return hr; - if ((hr = WsWriteBody( handle, desc, option, body, size, NULL )) != S_OK) return hr; - return WsWriteEnvelopeEnd( handle, NULL ); -} - static HRESULT send_message_http( HINTERNET request, BYTE *data, ULONG len ) { if (!WinHttpSendRequest( request, NULL, 0, data, len, len, 0 )) @@ -1298,8 +1289,7 @@ static HRESULT init_writer( struct channel *channel ) bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; bin.dynamicStringCallback = dict_cb; bin.dynamicStringCallbackState = &channel->dict_send; - if ((hr = WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL )) != S_OK) return hr; - return writer_enable_lookup( channel->writer ); + return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); case WS_ENCODING_XML_BINARY_1: return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); @@ -1310,6 +1300,17 @@ static HRESULT init_writer( struct channel *channel ) } } +static HRESULT write_message( struct channel *channel, WS_MESSAGE *msg, const WS_ELEMENT_DESCRIPTION *desc, + WS_WRITE_OPTION option, const void *body, ULONG size ) +{ + HRESULT hr; + if ((hr = writer_set_lookup( channel->writer, TRUE )) != S_OK) return hr; + if ((hr = WsWriteEnvelopeStart( msg, channel->writer, NULL, NULL, NULL )) != S_OK) return hr; + if ((hr = writer_set_lookup( channel->writer, FALSE )) != S_OK) return hr; + if ((hr = WsWriteBody( msg, desc, option, body, size, NULL )) != S_OK) return hr; + return WsWriteEnvelopeEnd( msg, NULL ); +} + /************************************************************************** * WsSendMessage [webservices.@] */ @@ -1339,8 +1340,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS if ((hr = message_set_action( msg, desc->action )) != S_OK) goto done; if ((hr = init_writer( channel )) != S_OK) goto done; - if ((hr = write_message( msg, channel->writer, desc->bodyElementDescription, option, body, size )) != S_OK) - goto done; + if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) goto done; hr = send_message( channel, msg ); done: @@ -1380,13 +1380,11 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS if ((hr = message_set_request_id( msg, &req_id )) != S_OK) goto done; if ((hr = init_writer( channel )) != S_OK) goto done; - if ((hr = write_message( msg, channel->writer, desc->bodyElementDescription, option, body, size )) != S_OK) - goto done; + if ((hr = write_message( channel, msg, desc->bodyElementDescription, option, body, size )) != S_OK) goto done; hr = send_message( channel, msg ); done: LeaveCriticalSection( &channel->cs ); - FIXME( "returning %08x\n", hr ); return hr; } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index cce49cc..bfc3202 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -50,7 +50,7 @@ const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; void clear_dict( struct dictionary * ) DECLSPEC_HIDDEN; -HRESULT writer_enable_lookup( WS_XML_WRITER * ) DECLSPEC_HIDDEN; +HRESULT writer_set_lookup( WS_XML_WRITER *, BOOL ) DECLSPEC_HIDDEN; const char *debugstr_xmlstr( const WS_XML_STRING * ) DECLSPEC_HIDDEN; WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 33c1be7..b3d130a 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -4849,7 +4849,7 @@ done: return hr; } -HRESULT writer_enable_lookup( WS_XML_WRITER *handle ) +HRESULT writer_set_lookup( WS_XML_WRITER *handle, BOOL enable ) { struct writer *writer = (struct writer *)handle; @@ -4861,7 +4861,7 @@ HRESULT writer_enable_lookup( WS_XML_WRITER *handle ) return E_INVALIDARG; } - writer->dict_do_lookup = TRUE; + writer->dict_do_lookup = enable; LeaveCriticalSection( &writer->cs ); return S_OK;

1 0

Hans Leidekker : webservices: Send incremental string table updates with messages in the same session.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 3c3ab8911ef6dcb89377ddb2dd289749420e73e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c3ab8911ef6dcb89377ddb2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 15:04:48 2018 +0200 webservices: Send incremental string table updates with messages in the same session. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 31 +++++++++++++++++-------------- dlls/webservices/string.c | 18 +++++++++++++++++- dlls/webservices/webservices_private.h | 3 +++ dlls/webservices/writer.c | 19 +++++++++++++++++++ 4 files changed, 56 insertions(+), 15 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 79d431f..5963faf 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1009,22 +1009,26 @@ static inline ULONG size_length( ULONG size ) return 5; } -static ULONG string_table_size( const WS_XML_DICTIONARY *dict ) +static ULONG string_table_size( const struct dictionary *dict ) { ULONG i, size = 0; - for (i = 0; i < dict->stringCount; i++) - size += size_length( dict->strings[i].length ) + dict->strings[i].length; + for (i = 0; i < dict->dict.stringCount; i++) + { + if (dict->sequence[i] == dict->current_sequence) + size += size_length( dict->dict.strings[i].length ) + dict->dict.strings[i].length; + } return size; } -static HRESULT send_string_table( SOCKET socket, const WS_XML_DICTIONARY *dict ) +static HRESULT send_string_table( SOCKET socket, const struct dictionary *dict ) { ULONG i; HRESULT hr; - for (i = 0; i < dict->stringCount; i++) + for (i = 0; i < dict->dict.stringCount; i++) { - if ((hr = send_size( socket, dict->strings[i].length )) != S_OK) return hr; - if ((hr = send_bytes( socket, dict->strings[i].bytes, dict->strings[i].length )) != S_OK) return hr; + if (dict->sequence[i] != dict->current_sequence) continue; + if ((hr = send_size( socket, dict->dict.strings[i].length )) != S_OK) return hr; + if ((hr = send_bytes( socket, dict->dict.strings[i].bytes, dict->dict.strings[i].length )) != S_OK) return hr; } return S_OK; } @@ -1154,13 +1158,13 @@ static HRESULT receive_preamble_ack( struct channel *channel ) static HRESULT send_sized_envelope( struct channel *channel, BYTE *data, ULONG len ) { - ULONG table_size = string_table_size( &channel->dict_send.dict ); + ULONG table_size = string_table_size( &channel->dict_send ); HRESULT hr; if ((hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_SIZED_ENVELOPE )) != S_OK) return hr; if ((hr = send_size( channel->u.tcp.socket, size_length(table_size) + table_size + len )) != S_OK) return hr; if ((hr = send_size( channel->u.tcp.socket, table_size )) != S_OK) return hr; - if ((hr = send_string_table( channel->u.tcp.socket, &channel->dict_send.dict )) != S_OK) return hr; + if ((hr = send_string_table( channel->u.tcp.socket, &channel->dict_send )) != S_OK) return hr; return send_bytes( channel->u.tcp.socket, data, len ); } @@ -1285,11 +1289,8 @@ static HRESULT init_writer( struct channel *channel ) return WsSetOutput( channel->writer, &text.encoding, &buf.output, NULL, 0, NULL ); case WS_ENCODING_XML_BINARY_SESSION_1: - clear_dict( &channel->dict_send ); - bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; - bin.dynamicStringCallback = dict_cb; - bin.dynamicStringCallbackState = &channel->dict_send; - return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); + bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; + /* fall through */ case WS_ENCODING_XML_BINARY_1: return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); @@ -1307,6 +1308,8 @@ static HRESULT write_message( struct channel *channel, WS_MESSAGE *msg, const WS if ((hr = writer_set_lookup( channel->writer, TRUE )) != S_OK) return hr; if ((hr = WsWriteEnvelopeStart( msg, channel->writer, NULL, NULL, NULL )) != S_OK) return hr; if ((hr = writer_set_lookup( channel->writer, FALSE )) != S_OK) return hr; + channel->dict_send.current_sequence++; + if ((hr = writer_set_dict_callback( channel->writer, dict_cb, &channel->dict_send )) != S_OK) return hr; if ((hr = WsWriteBody( msg, desc, option, body, size, NULL )) != S_OK) return hr; return WsWriteEnvelopeEnd( msg, NULL ); } diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 18c55e3..0bb77df 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -91,7 +91,7 @@ int find_string( const struct dictionary *dict, const unsigned char *data, ULONG static HRESULT grow_dict( struct dictionary *dict, ULONG size ) { WS_XML_STRING *tmp; - ULONG new_size, *tmp_sorted; + ULONG new_size, *tmp_sorted, *tmp_sequence; assert( !dict->dict.isConst ); if (dict->size >= dict->dict.stringCount + size) return S_OK; @@ -107,6 +107,14 @@ static HRESULT grow_dict( struct dictionary *dict, ULONG size ) dict->dict.strings = NULL; return E_OUTOFMEMORY; } + if (!(dict->sequence = heap_alloc( new_size * sizeof(*dict->sequence) ))) + { + heap_free( dict->dict.strings ); + dict->dict.strings = NULL; + heap_free( dict->sorted ); + dict->sorted = NULL; + return E_OUTOFMEMORY; + } dict->size = new_size; return S_OK; } @@ -116,6 +124,8 @@ static HRESULT grow_dict( struct dictionary *dict, ULONG size ) dict->dict.strings = tmp; if (!(tmp_sorted = heap_realloc( dict->sorted, new_size * sizeof(*tmp_sorted) ))) return E_OUTOFMEMORY; dict->sorted = tmp_sorted; + if (!(tmp_sequence = heap_realloc( dict->sequence, new_size * sizeof(*tmp_sequence) ))) return E_OUTOFMEMORY; + dict->sequence = tmp_sequence; dict->size = new_size; return S_OK; @@ -131,6 +141,9 @@ void clear_dict( struct dictionary *dict ) dict->dict.stringCount = 0; heap_free( dict->sorted ); dict->sorted = NULL; + heap_free( dict->sequence ); + dict->sequence = NULL; + dict->current_sequence = 0; dict->size = 0; } @@ -149,6 +162,9 @@ HRESULT insert_string( struct dictionary *dict, unsigned char *data, ULONG len, dict->dict.strings[id].dictionary = &dict->dict; dict->dict.strings[id].id = id; dict->dict.stringCount++; + + dict->sequence[id] = dict->current_sequence; + if (ret_id) *ret_id = id; return S_OK; } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index bfc3202..d981527 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -43,6 +43,8 @@ struct dictionary WS_XML_DICTIONARY dict; ULONG *sorted; ULONG size; + ULONG current_sequence; + ULONG *sequence; }; struct dictionary dict_builtin DECLSPEC_HIDDEN; const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; @@ -51,6 +53,7 @@ int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; void clear_dict( struct dictionary * ) DECLSPEC_HIDDEN; HRESULT writer_set_lookup( WS_XML_WRITER *, BOOL ) DECLSPEC_HIDDEN; +HRESULT writer_set_dict_callback( WS_XML_WRITER *, WS_DYNAMIC_STRING_CALLBACK, void * ) DECLSPEC_HIDDEN; const char *debugstr_xmlstr( const WS_XML_STRING * ) DECLSPEC_HIDDEN; WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b3d130a..95d4cad 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -4866,3 +4866,22 @@ HRESULT writer_set_lookup( WS_XML_WRITER *handle, BOOL enable ) LeaveCriticalSection( &writer->cs ); return S_OK; } + +HRESULT writer_set_dict_callback( WS_XML_WRITER *handle, WS_DYNAMIC_STRING_CALLBACK cb, void *state ) +{ + struct writer *writer = (struct writer *)handle; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + writer->dict_cb = cb; + writer->dict_cb_state = state; + + LeaveCriticalSection( &writer->cs ); + return S_OK; +}

1 0

Fabian Maurer : ntdll: Add stub for WinSqmSetDWORD.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: d863e268348a7f520066021e7335ea3436c82e47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d863e268348a7f520066021e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jun 17 18:18:32 2018 +0200 ntdll: Add stub for WinSqmSetDWORD. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 8 ++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 88e8b33..7ccaa0e 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -359,6 +359,14 @@ HANDLE WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unkno return INVALID_HANDLE_VALUE; } +/*********************************************************************** + * WinSqmSetDWORD (NTDLL.@) + */ +void WINAPI WinSqmSetDWORD(HANDLE session, DWORD datapoint_id, DWORD datapoint_value) +{ + FIXME("(%p, %d, %d): stub\n", session, datapoint_id, datapoint_value); +} + /****************************************************************************** * EtwEventRegister (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 45cedb7..0c667aa 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1031,6 +1031,7 @@ @ stdcall -ret64 VerSetConditionMask(int64 long long) @ stdcall WinSqmEndSession(long) @ stdcall WinSqmIsOptedIn() +@ stdcall WinSqmSetDWORD(ptr long long) @ stdcall WinSqmStartSession(ptr long long) @ stdcall -private ZwAcceptConnectPort(ptr long ptr long ptr ptr) NtAcceptConnectPort @ stdcall -private ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck

1 0

Zhiyi Zhang : gdiplus: Report error for brush_fill_path().
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 07cf5ed18940a61d5477a611529cf17be18e5c5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=07cf5ed18940a61d5477a611… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 20 15:13:49 2018 +0800 gdiplus: Report error for brush_fill_path(). Operation should be skipped if SelectClipPath() returns any error. And we should report unexpected error to the caller. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 894e879..a793665 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1050,8 +1050,9 @@ static BOOL brush_can_fill_path(GpBrush *brush, BOOL is_fill) } } -static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) +static GpStatus brush_fill_path(GpGraphics *graphics, GpBrush *brush) { + GpStatus status = Ok; switch (brush->bt) { case BrushTypeSolidColor: @@ -1064,13 +1065,19 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) RECT rc; /* partially transparent fill */ - SelectClipPath(graphics->hdc, RGN_AND); + if (!SelectClipPath(graphics->hdc, RGN_AND)) + { + status = GenericError; + DeleteObject(bmp); + break; + } if (GetClipBox(graphics->hdc, &rc) != NULLREGION) { HDC hdc = CreateCompatibleDC(NULL); if (!hdc) { + status = OutOfMemory; DeleteObject(bmp); break; } @@ -1091,7 +1098,11 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) HBRUSH gdibrush, old_brush; gdibrush = create_gdi_brush(brush); - if (!gdibrush) return; + if (!gdibrush) + { + status = OutOfMemory; + break; + } old_brush = SelectObject(graphics->hdc, gdibrush); FillPath(graphics->hdc); @@ -1100,6 +1111,8 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) break; } } + + return status; } static BOOL brush_can_fill_pixels(GpBrush *brush) @@ -4205,7 +4218,7 @@ static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath if(retval == Ok) { EndPath(graphics->hdc); - brush_fill_path(graphics, brush); + retval = brush_fill_path(graphics, brush); } gdi_transform_release(graphics); @@ -4511,13 +4524,13 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, Rectangle(graphics->hdc, rc.left, rc.top, rc.right, rc.bottom); EndPath(graphics->hdc); - brush_fill_path(graphics, brush); + status = brush_fill_path(graphics, brush); } RestoreDC(graphics->hdc, save_state); - return Ok; + return status; } static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush,

1 0

Zhiyi Zhang : gdiplus: Avoid calling GdipFillPath() with an empty path.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: cba24001e482fa8a8a1fbf5d5390539e2792b1aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=cba24001e482fa8a8a1fbf5d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 20 15:14:19 2018 +0800 gdiplus: Avoid calling GdipFillPath() with an empty path. There is no point filling an empty path. And an empty path will cause SelectClipPath() used in brush_fill_path() to return error. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 3 +++ dlls/gdiplus/tests/graphics.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a793665..2d23085 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4264,6 +4264,9 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p if(graphics->busy) return ObjectBusy; + if (!path->pathdata.Count) + return Ok; + if (graphics->image && graphics->image->type == ImageTypeMetafile) return METAFILE_FillPath((GpMetafile*)graphics->image, brush, path); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ae75c0e..5eb0a8a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1539,6 +1539,52 @@ static void test_GdipFillClosedCurveI(void) ReleaseDC(hwnd, hdc); } +static void test_GdipFillPath(void) +{ + GpStatus status; + GpGraphics *graphics; + GpSolidFill *brush; + GpPath *path; + HDC hdc = GetDC(hwnd); + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + status = GdipCreateSolidFill((ARGB)0xffffffff, &brush); + expect(Ok, status); + ok(brush != NULL, "Expected brush to be initialized\n"); + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + ok(path != NULL, "Expected path to be initialized\n"); + + /* Empty path */ + GdipResetPath(path); + status = GdipFillPath(graphics, (GpBrush *)brush, path); + expect(Ok, status); + + /* Not closed path */ + GdipResetPath(path); + status = GdipAddPathLineI(path, 0, 0, 2, 2); + expect(Ok, status); + status = GdipAddPathLineI(path, 2, 2, 4, 0); + expect(Ok, status); + status = GdipFillPath(graphics, (GpBrush *)brush, path); + expect(Ok, status); + + /* Closed path */ + GdipResetPath(path); + status = GdipAddPathRectangle(path, 0, 0, 4, 4); + expect(Ok, status); + status = GdipFillPath(graphics, (GpBrush *)brush, path); + expect(Ok, status); + + GdipDeletePath(path); + GdipDeleteBrush((GpBrush *)brush); + GdipDeleteGraphics(graphics); + ReleaseDC(hwnd, hdc); +} + static void test_Get_Release_DC(void) { GpStatus status; @@ -6795,6 +6841,7 @@ START_TEST(graphics) test_GdipDrawImagePointsRect(); test_GdipFillClosedCurve(); test_GdipFillClosedCurveI(); + test_GdipFillPath(); test_GdipDrawString(); test_GdipGetNearestColor(); test_GdipGetVisibleClipBounds();

1 0

Nikolay Sivov : crypt32: Use ARRAY_SIZE macro.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: 6de2e83e00f90b5be5231073a400e53209e4decc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de2e83e00f90b5be5231073… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 20 10:37:55 2018 +0300 crypt32: Use ARRAY_SIZE macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 3 +- dlls/crypt32/chain.c | 20 +++--- dlls/crypt32/crypt32_private.h | 2 + dlls/crypt32/decode.c | 89 ++++++++++++----------- dlls/crypt32/encode.c | 52 ++++++-------- dlls/crypt32/filestore.c | 3 +- dlls/crypt32/msg.c | 2 +- dlls/crypt32/object.c | 155 ++++++++++++++--------------------------- dlls/crypt32/oid.c | 9 ++- dlls/crypt32/regstore.c | 9 ++- dlls/crypt32/rootstore.c | 6 +- dlls/crypt32/sip.c | 5 +- dlls/crypt32/store.c | 7 +- dlls/crypt32/str.c | 6 +- 14 files changed, 150 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6de2e83e00f90b5be523…

1 0

Michael Müller : crypt32: Implement decoding of X509_OBJECT_IDENTIFIER.
by Alexandre Julliard 20 Jun '18

20 Jun '18

Module: wine Branch: master Commit: d791d36a9ba2cc78c943660707141dfab770c288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d791d36a9ba2cc78c9436607… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 20 10:37:56 2018 +0300 crypt32: Implement decoding of X509_OBJECT_IDENTIFIER. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 15 +++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a613160..4f11d0d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5973,6 +5973,46 @@ BOOL CRYPT_AsnDecodePKCSEnvelopedData(const BYTE *pbEncoded, DWORD cbEncoded, return ret; } +static BOOL WINAPI CRYPT_AsnDecodeObjectIdentifier(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + CRYPT_DECODE_PARA *pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + DWORD bytesNeeded = 0; + BOOL ret; + + __TRY + { + ret = CRYPT_AsnDecodeOidInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + NULL, &bytesNeeded, NULL); + if (ret) + { + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, bytesNeeded))) + { + LPSTR *info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + + info = pvStructInfo; + *info = (void *)((BYTE *)info + sizeof(*info)); + ret = CRYPT_AsnDecodeOidInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, + pvStructInfo, &bytesNeeded, NULL); + if (!ret && (dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + CRYPT_FreeSpace(pDecodePara, info); + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, LPCSTR lpszStructType) { @@ -6112,6 +6152,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(CMS_SIGNER_INFO): decodeFunc = CRYPT_AsnDecodeCMSSignerInfo; break; + case LOWORD(X509_OBJECT_IDENTIFIER): + decodeFunc = CRYPT_AsnDecodeObjectIdentifier; + break; } } else if (!strcmp(lpszStructType, szOID_CERT_EXTENSIONS)) @@ -6166,6 +6209,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodePolicyQualifierUserNotice; else if (!strcmp(lpszStructType, szOID_CTL)) decodeFunc = CRYPT_AsnDecodeCTL; + else if (!strcmp(lpszStructType, szOID_ECC_PUBLIC_KEY)) + decodeFunc = CRYPT_AsnDecodeObjectIdentifier; return decodeFunc; } diff --git a/include/wincrypt.h b/include/wincrypt.h index 6e71fb9..a7c24e7 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -288,6 +288,11 @@ typedef struct _CERT_KEY_ATTRIBUTES_INFO { PCERT_PRIVATE_KEY_VALIDITY pPrivateKeyUsagePeriod; } CERT_KEY_ATTRIBUTES_INFO, *PCERT_KEY_ATTRIBUTES_INFO; +typedef struct _CERT_ECC_SIGNATURE { + CRYPT_UINT_BLOB r; + CRYPT_UINT_BLOB s; +} CERT_ECC_SIGNATURE, *PCERT_ECC_SIGNATURE; + /* byte 0 */ #define CERT_DIGITAL_SIGNATURE_KEY_USAGE 0x80 #define CERT_NON_REPUDIATION_KEY_USAGE 0x40 @@ -2878,6 +2883,12 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_X957 "1.2.840.10040" #define szOID_X957_DSA "1.2.840.10040.4.1" #define szOID_X957_SHA1DSA "1.2.840.10040.4.3" +#define szOID_ECC_PUBLIC_KEY "1.2.840.10045.2.1" +#define szOID_ECC_CURVE_P256 "1.2.840.10045.3.1.7" +#define szOID_ECDSA_SPECIFIED "1.2.840.10045.4.3" +#define szOID_ECDSA_SHA256 "1.2.840.10045.4.3.2" +#define szOID_ECDSA_SHA384 "1.2.840.10045.4.3.3" +#define szOID_ECDSA_SHA512 "1.2.840.10045.4.3.4" #define szOID_DS "2.5" #define szOID_DSALG "2.5.8" #define szOID_DSALG_CRPT "2.5.8.1" @@ -2919,6 +2930,8 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_OIWDIR_SIGN "1.3.14.7.2.3" #define szOID_OIWDIR_md2 "1.3.14.7.2.2.1" #define szOID_OIWDIR_md2RSA "1.3.14.7.2.3.1" +#define szOID_ECC_CURVE_P384 "1.3.132.0.34" +#define szOID_ECC_CURVE_P521 "1.3.132.0.35" #define szOID_INFOSEC "2.16.840.1.101.2.1" #define szOID_INFOSEC_sdnsSignature "2.16.840.1.101.2.1.1.1" #define szOID_INFOSEC_mosaicSignature "2.16.840.1.101.2.1.1.2" @@ -3223,6 +3236,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define X509_PKIX_POLICY_QUALIFIER_USERNOTICE ((LPCSTR)46) #define X509_DH_PUBLICKEY X509_MULTI_BYTE_UINT #define X509_DH_PARAMETERS ((LPCSTR)47) +#define X509_ECC_SIGNATURE ((LPCSTR)47) #define PKCS_ATTRIBUTES ((LPCSTR)48) #define PKCS_SORTED_CTL ((LPCSTR)49) #define X942_DH_PARAMETERS ((LPCSTR)50) @@ -3240,6 +3254,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CMC_ADD_EXTENSIONS ((LPCSTR)62) #define CMC_ADD_ATTRIBUTES ((LPCSTR)63) #define X509_CERTIFICATE_TEMPLATE ((LPCSTR)64) +#define X509_OBJECT_IDENTIFIER ((LPCSTR)73) #define PKCS7_SIGNER_INFO ((LPCSTR)500) #define CMS_SIGNER_INFO ((LPCSTR)501)

1 0