Skip to content

W
wine-winehq
Commit 049d8cfc authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

webservices: Read the string table in all sized envelopes.

Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 91690539
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 11 deletions
dlls/webservices/channel.c
View file @ 049d8cfc
......@@ -1547,12 +1547,10 @@ static HRESULT send_preamble_ack( struct channel *channel )
return S_OK;
}
static HRESULT receive_message_session_setup( struct channel *channel )
static HRESULT receive_message_session( struct channel *channel )
{
HRESULT hr;
if ((hr = receive_preamble( channel )) != S_OK) return hr;
if ((hr = send_preamble_ack( channel )) != S_OK) return hr;
if ((hr = receive_sized_envelope( channel )) != S_OK) return hr;
if (channel->encoding == WS_ENCODING_XML_BINARY_SESSION_1)
{
......@@ -1566,13 +1564,6 @@ static HRESULT receive_message_session_setup( struct channel *channel )
return init_reader( channel );
}
static HRESULT receive_message_session( struct channel *channel )
{
HRESULT hr;
if ((hr = receive_sized_envelope( channel )) != S_OK) return hr;
return init_reader( channel );
}
static HRESULT receive_message_sock( struct channel *channel, SOCKET socket )
{
HRESULT hr;
......@@ -1596,7 +1587,9 @@ static HRESULT receive_message( struct channel *channel )
switch (channel->session_state)
{
case SESSION_STATE_UNINITIALIZED:
return receive_message_session_setup( channel );
if ((hr = receive_preamble( channel )) != S_OK) return hr;
if ((hr = send_preamble_ack( channel )) != S_OK) return hr;
/* fall through */
case SESSION_STATE_SETUP_COMPLETE:
return receive_message_session( channel );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment