Skip to content

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

webservices: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 5d0b23be
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 203 deletions
dlls/webservices/Makefile.in
View file @ 338f1458
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = webservices.dll MODULE = webservices.dll
IMPORTLIB = webservices IMPORTLIB = webservices
IMPORTS = winhttp rpcrt4 user32 ws2_32 IMPORTS = winhttp rpcrt4 user32 ws2_32
......
dlls/webservices/channel.c
View file @ 338f1458
...@@ -141,7 +141,7 @@ static void CALLBACK queue_runner( TP_CALLBACK_INSTANCE *instance, void *ctx ) ...@@ -141,7 +141,7 @@ static void CALLBACK queue_runner( TP_CALLBACK_INSTANCE *instance, void *ctx )
return; return;
default: default:
ERR( "wait failed %u\n", err ); ERR( "wait failed %lu\n", err );
return; return;
} }
} }
...@@ -497,8 +497,8 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, ...@@ -497,8 +497,8 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding,
{ {
const WS_CHANNEL_PROPERTY *prop = &properties[i]; const WS_CHANNEL_PROPERTY *prop = &properties[i];
TRACE( "property id %u value %p size %u\n", prop->id, prop->value, prop->valueSize ); TRACE( "property id %u value %p size %lu\n", prop->id, prop->value, prop->valueSize );
if (prop->valueSize == sizeof(ULONG) && prop->value) TRACE( " value %08x\n", *(ULONG *)prop->value ); if (prop->valueSize == sizeof(ULONG) && prop->value) TRACE( " value %#lx\n", *(ULONG *)prop->value );
switch (prop->id) switch (prop->id)
{ {
...@@ -559,7 +559,7 @@ HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding ...@@ -559,7 +559,7 @@ HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding
struct channel *channel; struct channel *channel;
HRESULT hr; HRESULT hr;
TRACE( "%u %u %p %u %p %p %p\n", type, binding, properties, count, desc, handle, error ); TRACE( "%u %u %p %lu %p %p %p\n", type, binding, properties, count, desc, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (desc) FIXME( "ignoring security description\n" ); if (desc) FIXME( "ignoring security description\n" );
...@@ -596,7 +596,7 @@ HRESULT WINAPI WsCreateChannelForListener( WS_LISTENER *listener_handle, const W ...@@ -596,7 +596,7 @@ HRESULT WINAPI WsCreateChannelForListener( WS_LISTENER *listener_handle, const W
WS_CHANNEL_BINDING binding; WS_CHANNEL_BINDING binding;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %u %p %p\n", listener_handle, properties, count, handle, error ); TRACE( "%p %p %lu %p %p\n", listener_handle, properties, count, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!listener_handle || !handle) return E_INVALIDARG; if (!listener_handle || !handle) return E_INVALIDARG;
...@@ -669,7 +669,7 @@ HRESULT WINAPI WsResetChannel( WS_CHANNEL *handle, WS_ERROR *error ) ...@@ -669,7 +669,7 @@ HRESULT WINAPI WsResetChannel( WS_CHANNEL *handle, WS_ERROR *error )
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -682,7 +682,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID ...@@ -682,7 +682,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID
struct channel *channel = (struct channel *)handle; struct channel *channel = (struct channel *)handle;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!channel) return E_INVALIDARG; if (!channel) return E_INVALIDARG;
...@@ -717,7 +717,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID ...@@ -717,7 +717,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -730,7 +730,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID ...@@ -730,7 +730,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID
struct channel *channel = (struct channel *)handle; struct channel *channel = (struct channel *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %u\n", handle, id, value, size ); TRACE( "%p %u %p %lu %p\n", handle, id, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!channel) return E_INVALIDARG; if (!channel) return E_INVALIDARG;
...@@ -746,7 +746,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID ...@@ -746,7 +746,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID
hr = prop_set( channel->prop, channel->prop_count, id, value, size ); hr = prop_set( channel->prop, channel->prop_count, id, value, size );
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -838,7 +838,7 @@ static void shutdown_session_proc( struct task *task ) ...@@ -838,7 +838,7 @@ static void shutdown_session_proc( struct task *task )
hr = shutdown_session( s->channel ); hr = shutdown_session( s->channel );
TRACE( "calling %p(%08x)\n", s->ctx.callback, hr ); TRACE( "calling %p(%#lx)\n", s->ctx.callback, hr );
s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState ); s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState );
TRACE( "%p returned\n", s->ctx.callback ); TRACE( "%p returned\n", s->ctx.callback );
} }
...@@ -888,7 +888,7 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT ...@@ -888,7 +888,7 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -959,7 +959,7 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, ...@@ -959,7 +959,7 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx,
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1196,7 +1196,7 @@ static void open_channel_proc( struct task *task ) ...@@ -1196,7 +1196,7 @@ static void open_channel_proc( struct task *task )
hr = open_channel( o->channel, o->endpoint ); hr = open_channel( o->channel, o->endpoint );
TRACE( "calling %p(%08x)\n", o->ctx.callback, hr ); TRACE( "calling %p(%#lx)\n", o->ctx.callback, hr );
o->ctx.callback( hr, WS_LONG_CALLBACK, o->ctx.callbackState ); o->ctx.callback( hr, WS_LONG_CALLBACK, o->ctx.callbackState );
TRACE( "%p returned\n", o->ctx.callback ); TRACE( "%p returned\n", o->ctx.callback );
} }
...@@ -1252,7 +1252,7 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end ...@@ -1252,7 +1252,7 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1362,7 +1362,7 @@ static enum session_mode map_channel_type( struct channel *channel ) ...@@ -1362,7 +1362,7 @@ static enum session_mode map_channel_type( struct channel *channel )
{ {
case WS_CHANNEL_TYPE_DUPLEX_SESSION: return SESSION_MODE_DUPLEX; case WS_CHANNEL_TYPE_DUPLEX_SESSION: return SESSION_MODE_DUPLEX;
default: default:
FIXME( "unhandled channel type %08x\n", channel->type ); FIXME( "unhandled channel type %#x\n", channel->type );
return SESSION_MODE_INVALID; return SESSION_MODE_INVALID;
} }
} }
...@@ -1712,7 +1712,7 @@ static void send_message_proc( struct task *task ) ...@@ -1712,7 +1712,7 @@ static void send_message_proc( struct task *task )
hr = send_message( s->channel, s->msg, s->desc, s->option, s->body, s->size ); hr = send_message( s->channel, s->msg, s->desc, s->option, s->body, s->size );
TRACE( "calling %p(%08x)\n", s->ctx.callback, hr ); TRACE( "calling %p(%#lx)\n", s->ctx.callback, hr );
s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState ); s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState );
TRACE( "%p returned\n", s->ctx.callback ); TRACE( "%p returned\n", s->ctx.callback );
} }
...@@ -1746,7 +1746,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS ...@@ -1746,7 +1746,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS
struct async async; struct async async;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %p %08x %p %u %p %p\n", handle, msg, desc, option, body, size, ctx, error ); TRACE( "%p %p %p %u %p %lu %p %p\n", handle, msg, desc, option, body, size, ctx, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!channel || !msg || !desc) return E_INVALIDARG; if (!channel || !msg || !desc) return E_INVALIDARG;
...@@ -1775,7 +1775,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS ...@@ -1775,7 +1775,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1792,7 +1792,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS ...@@ -1792,7 +1792,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS
GUID id; GUID id;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %p %08x %p %u %p %p %p\n", handle, msg, desc, option, body, size, request, ctx, error ); TRACE( "%p %p %p %u %p %lu %p %p %p\n", handle, msg, desc, option, body, size, request, ctx, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!channel || !msg || !desc || !request) return E_INVALIDARG; if (!channel || !msg || !desc || !request) return E_INVALIDARG;
...@@ -1824,7 +1824,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS ...@@ -1824,7 +1824,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS
done: done:
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2362,7 +2362,7 @@ static void receive_message_proc( struct task *task ) ...@@ -2362,7 +2362,7 @@ static void receive_message_proc( struct task *task )
hr = receive_message( r->channel, r->msg, r->desc, r->count, r->option, r->read_option, r->heap, r->value, hr = receive_message( r->channel, r->msg, r->desc, r->count, r->option, r->read_option, r->heap, r->value,
r->size, r->index ); r->size, r->index );
TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); TRACE( "calling %p(%#lx)\n", r->ctx.callback, hr );
r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState );
TRACE( "%p returned\n", r->ctx.callback ); TRACE( "%p returned\n", r->ctx.callback );
} }
...@@ -2402,7 +2402,7 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M ...@@ -2402,7 +2402,7 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M
struct async async; struct async async;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %p %u %08x %08x %p %p %u %p %p %p\n", handle, msg, desc, count, option, read_option, heap, TRACE( "%p %p %p %lu %u %u %p %p %lu %p %p %p\n", handle, msg, desc, count, option, read_option, heap,
value, size, index, ctx, error ); value, size, index, ctx, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
...@@ -2426,7 +2426,7 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M ...@@ -2426,7 +2426,7 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2471,7 +2471,7 @@ static void request_reply_proc( struct task *task ) ...@@ -2471,7 +2471,7 @@ static void request_reply_proc( struct task *task )
hr = request_reply( r->channel, r->request, r->request_desc, r->write_option, r->request_body, r->request_size, hr = request_reply( r->channel, r->request, r->request_desc, r->write_option, r->request_body, r->request_size,
r->reply, r->reply_desc, r->read_option, r->heap, r->value, r->size ); r->reply, r->reply_desc, r->read_option, r->heap, r->value, r->size );
TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); TRACE( "calling %p(%#lx)\n", r->ctx.callback, hr );
r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState );
TRACE( "%p returned\n", r->ctx.callback ); TRACE( "%p returned\n", r->ctx.callback );
} }
...@@ -2515,7 +2515,7 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS ...@@ -2515,7 +2515,7 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS
struct async async; struct async async;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %p %08x %p %u %p %p %08x %p %p %u %p %p\n", handle, request, request_desc, write_option, TRACE( "%p %p %p %u %p %lu %p %p %u %p %p %lu %p %p\n", handle, request, request_desc, write_option,
request_body, request_size, reply, reply_desc, read_option, heap, value, size, ctx, error ); request_body, request_size, reply, reply_desc, read_option, heap, value, size, ctx, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
...@@ -2546,7 +2546,7 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS ...@@ -2546,7 +2546,7 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2573,7 +2573,7 @@ static void read_message_start_proc( struct task *task ) ...@@ -2573,7 +2573,7 @@ static void read_message_start_proc( struct task *task )
hr = read_message_start( r->channel, r->msg ); hr = read_message_start( r->channel, r->msg );
TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); TRACE( "calling %p(%#lx)\n", r->ctx.callback, hr );
r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState );
TRACE( "%p returned\n", r->ctx.callback ); TRACE( "%p returned\n", r->ctx.callback );
} }
...@@ -2627,7 +2627,7 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS ...@@ -2627,7 +2627,7 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2650,7 +2650,7 @@ static void read_message_end_proc( struct task *task ) ...@@ -2650,7 +2650,7 @@ static void read_message_end_proc( struct task *task )
hr = read_message_end( r->msg ); hr = read_message_end( r->msg );
TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); TRACE( "calling %p(%#lx)\n", r->ctx.callback, hr );
r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState );
TRACE( "%p returned\n", r->ctx.callback ); TRACE( "%p returned\n", r->ctx.callback );
} }
...@@ -2698,7 +2698,7 @@ HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_A ...@@ -2698,7 +2698,7 @@ HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_A
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2725,7 +2725,7 @@ static void write_message_start_proc( struct task *task ) ...@@ -2725,7 +2725,7 @@ static void write_message_start_proc( struct task *task )
hr = write_message_start( w->channel, w->msg ); hr = write_message_start( w->channel, w->msg );
TRACE( "calling %p(%08x)\n", w->ctx.callback, hr ); TRACE( "calling %p(%#lx)\n", w->ctx.callback, hr );
w->ctx.callback( hr, WS_LONG_CALLBACK, w->ctx.callbackState ); w->ctx.callback( hr, WS_LONG_CALLBACK, w->ctx.callbackState );
TRACE( "%p returned\n", w->ctx.callback ); TRACE( "%p returned\n", w->ctx.callback );
} }
...@@ -2779,7 +2779,7 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W ...@@ -2779,7 +2779,7 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2805,7 +2805,7 @@ static void write_message_end_proc( struct task *task ) ...@@ -2805,7 +2805,7 @@ static void write_message_end_proc( struct task *task )
hr = write_message_end( w->channel, w->msg ); hr = write_message_end( w->channel, w->msg );
TRACE( "calling %p(%08x)\n", w->ctx.callback, hr ); TRACE( "calling %p(%#lx)\n", w->ctx.callback, hr );
w->ctx.callback( hr, WS_LONG_CALLBACK, w->ctx.callbackState ); w->ctx.callback( hr, WS_LONG_CALLBACK, w->ctx.callbackState );
TRACE( "%p returned\n", w->ctx.callback ); TRACE( "%p returned\n", w->ctx.callback );
} }
...@@ -2859,7 +2859,7 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ ...@@ -2859,7 +2859,7 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_
} }
LeaveCriticalSection( &channel->cs ); LeaveCriticalSection( &channel->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
......
dlls/webservices/error.c
View file @ 338f1458
...@@ -81,7 +81,7 @@ HRESULT WINAPI WsCreateError( const WS_ERROR_PROPERTY *properties, ULONG count, ...@@ -81,7 +81,7 @@ HRESULT WINAPI WsCreateError( const WS_ERROR_PROPERTY *properties, ULONG count,
HRESULT hr; HRESULT hr;
ULONG i; ULONG i;
TRACE( "%p %u %p\n", properties, count, handle ); TRACE( "%p %lu %p\n", properties, count, handle );
if (!handle) return E_INVALIDARG; if (!handle) return E_INVALIDARG;
if (!(error = alloc_error())) return E_OUTOFMEMORY; if (!(error = alloc_error())) return E_OUTOFMEMORY;
...@@ -164,7 +164,7 @@ HRESULT WINAPI WsResetError( WS_ERROR *handle ) ...@@ -164,7 +164,7 @@ HRESULT WINAPI WsResetError( WS_ERROR *handle )
reset_error( error ); reset_error( error );
LeaveCriticalSection( &error->cs ); LeaveCriticalSection( &error->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -177,7 +177,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo ...@@ -177,7 +177,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo
struct error *error = (struct error *)handle; struct error *error = (struct error *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %u\n", handle, id, buf, size ); TRACE( "%p %u %p %lu\n", handle, id, buf, size );
if (!error) return E_INVALIDARG; if (!error) return E_INVALIDARG;
...@@ -192,7 +192,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo ...@@ -192,7 +192,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo
hr = prop_get( error->prop, error->prop_count, id, buf, size ); hr = prop_get( error->prop, error->prop_count, id, buf, size );
LeaveCriticalSection( &error->cs ); LeaveCriticalSection( &error->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -201,7 +201,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo ...@@ -201,7 +201,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo
*/ */
HRESULT WINAPI WsGetErrorString( WS_ERROR *handle, ULONG index, WS_STRING *str ) HRESULT WINAPI WsGetErrorString( WS_ERROR *handle, ULONG index, WS_STRING *str )
{ {
FIXME( "%p %u %p: stub\n", handle, index, str ); FIXME( "%p %lu %p: stub\n", handle, index, str );
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -214,7 +214,7 @@ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, co ...@@ -214,7 +214,7 @@ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, co
struct error *error = (struct error *)handle; struct error *error = (struct error *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %u\n", handle, id, value, size ); TRACE( "%p %u %p %lu\n", handle, id, value, size );
if (!error) return E_INVALIDARG; if (!error) return E_INVALIDARG;
...@@ -230,6 +230,6 @@ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, co ...@@ -230,6 +230,6 @@ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, co
else hr = prop_set( error->prop, error->prop_count, id, value, size ); else hr = prop_set( error->prop, error->prop_count, id, value, size );
LeaveCriticalSection( &error->cs ); LeaveCriticalSection( &error->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
dlls/webservices/heap.c
View file @ 338f1458
...@@ -166,7 +166,7 @@ HRESULT WINAPI WsAlloc( WS_HEAP *handle, SIZE_T size, void **ptr, WS_ERROR *erro ...@@ -166,7 +166,7 @@ HRESULT WINAPI WsAlloc( WS_HEAP *handle, SIZE_T size, void **ptr, WS_ERROR *erro
{ {
void *mem; void *mem;
TRACE( "%p %u %p %p\n", handle, (ULONG)size, ptr, error ); TRACE( "%p %Iu %p %p\n", handle, size, ptr, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!handle || !ptr) return E_INVALIDARG; if (!handle || !ptr) return E_INVALIDARG;
...@@ -200,7 +200,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR ...@@ -200,7 +200,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR
{ {
struct heap *heap; struct heap *heap;
TRACE( "%u %u %p %u %p %p\n", (ULONG)max_size, (ULONG)trim_size, properties, count, handle, error ); TRACE( "%Iu %Iu %p %lu %p %p\n", max_size, trim_size, properties, count, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!handle || count) return E_INVALIDARG; if (!handle || count) return E_INVALIDARG;
...@@ -274,7 +274,7 @@ HRESULT WINAPI WsResetHeap( WS_HEAP *handle, WS_ERROR *error ) ...@@ -274,7 +274,7 @@ HRESULT WINAPI WsResetHeap( WS_HEAP *handle, WS_ERROR *error )
reset_heap( heap ); reset_heap( heap );
LeaveCriticalSection( &heap->cs ); LeaveCriticalSection( &heap->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -287,7 +287,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void ...@@ -287,7 +287,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void
struct heap *heap = (struct heap *)handle; struct heap *heap = (struct heap *)handle;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!heap) return E_INVALIDARG; if (!heap) return E_INVALIDARG;
...@@ -315,7 +315,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void ...@@ -315,7 +315,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void
} }
LeaveCriticalSection( &heap->cs ); LeaveCriticalSection( &heap->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -357,7 +357,7 @@ HRESULT WINAPI WsCreateXmlBuffer( WS_HEAP *heap, const WS_XML_BUFFER_PROPERTY *p ...@@ -357,7 +357,7 @@ HRESULT WINAPI WsCreateXmlBuffer( WS_HEAP *heap, const WS_XML_BUFFER_PROPERTY *p
{ {
struct xmlbuf *xmlbuf; struct xmlbuf *xmlbuf;
TRACE( "%p %p %u %p %p\n", heap, properties, count, handle, error ); TRACE( "%p %p %lu %p %p\n", heap, properties, count, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!heap || !handle) return E_INVALIDARG; if (!heap || !handle) return E_INVALIDARG;
......
dlls/webservices/listener.c
View file @ 338f1458
...@@ -234,7 +234,7 @@ HRESULT WINAPI WsCreateListener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING bindin ...@@ -234,7 +234,7 @@ HRESULT WINAPI WsCreateListener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING bindin
struct listener *listener; struct listener *listener;
HRESULT hr; HRESULT hr;
TRACE( "%u %u %p %u %p %p %p\n", type, binding, properties, count, desc, handle, error ); TRACE( "%u %u %p %lu %p %p %p\n", type, binding, properties, count, desc, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (desc) FIXME( "ignoring security description\n" ); if (desc) FIXME( "ignoring security description\n" );
...@@ -471,7 +471,7 @@ HRESULT WINAPI WsOpenListener( WS_LISTENER *handle, WS_STRING *url, const WS_ASY ...@@ -471,7 +471,7 @@ HRESULT WINAPI WsOpenListener( WS_LISTENER *handle, WS_STRING *url, const WS_ASY
else hr = open_listener( listener, url ); else hr = open_listener( listener, url );
LeaveCriticalSection( &listener->cs ); LeaveCriticalSection( &listener->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -506,7 +506,7 @@ HRESULT WINAPI WsCloseListener( WS_LISTENER *handle, const WS_ASYNC_CONTEXT *ctx ...@@ -506,7 +506,7 @@ HRESULT WINAPI WsCloseListener( WS_LISTENER *handle, const WS_ASYNC_CONTEXT *ctx
close_listener( listener ); close_listener( listener );
LeaveCriticalSection( &listener->cs ); LeaveCriticalSection( &listener->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -537,7 +537,7 @@ HRESULT WINAPI WsResetListener( WS_LISTENER *handle, WS_ERROR *error ) ...@@ -537,7 +537,7 @@ HRESULT WINAPI WsResetListener( WS_LISTENER *handle, WS_ERROR *error )
reset_listener( listener ); reset_listener( listener );
LeaveCriticalSection( &listener->cs ); LeaveCriticalSection( &listener->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -550,7 +550,7 @@ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ ...@@ -550,7 +550,7 @@ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_
struct listener *listener = (struct listener *)handle; struct listener *listener = (struct listener *)handle;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!listener) return E_INVALIDARG; if (!listener) return E_INVALIDARG;
...@@ -585,7 +585,7 @@ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ ...@@ -585,7 +585,7 @@ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_
} }
LeaveCriticalSection( &listener->cs ); LeaveCriticalSection( &listener->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -598,7 +598,7 @@ HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ ...@@ -598,7 +598,7 @@ HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_
struct listener *listener = (struct listener *)handle; struct listener *listener = (struct listener *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %u\n", handle, id, value, size ); TRACE( "%p %u %p %lu %p\n", handle, id, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!listener) return E_INVALIDARG; if (!listener) return E_INVALIDARG;
...@@ -614,7 +614,7 @@ HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ ...@@ -614,7 +614,7 @@ HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_
hr = prop_set( listener->prop, listener->prop_count, id, value, size ); hr = prop_set( listener->prop, listener->prop_count, id, value, size );
LeaveCriticalSection( &listener->cs ); LeaveCriticalSection( &listener->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -660,7 +660,7 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, ...@@ -660,7 +660,7 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle,
LeaveCriticalSection( &listener->cs ); LeaveCriticalSection( &listener->cs );
hr = channel_accept_tcp( socket, wait, cancel, channel_handle ); hr = channel_accept_tcp( socket, wait, cancel, channel_handle );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
case WS_UDP_CHANNEL_BINDING: case WS_UDP_CHANNEL_BINDING:
...@@ -669,7 +669,7 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, ...@@ -669,7 +669,7 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle,
LeaveCriticalSection( &listener->cs ); LeaveCriticalSection( &listener->cs );
hr = channel_accept_udp( socket, wait, cancel, channel_handle ); hr = channel_accept_udp( socket, wait, cancel, channel_handle );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
default: default:
...@@ -679,6 +679,6 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, ...@@ -679,6 +679,6 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle,
} }
LeaveCriticalSection( &listener->cs ); LeaveCriticalSection( &listener->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
dlls/webservices/msg.c
View file @ 338f1458
...@@ -216,7 +216,7 @@ HRESULT WINAPI WsCreateMessage( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_V ...@@ -216,7 +216,7 @@ HRESULT WINAPI WsCreateMessage( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_V
{ {
HRESULT hr; HRESULT hr;
TRACE( "%u %u %p %u %p %p\n", env_version, addr_version, properties, count, handle, error ); TRACE( "%u %u %p %lu %p %p\n", env_version, addr_version, properties, count, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!handle || !env_version || !addr_version || if (!handle || !env_version || !addr_version ||
...@@ -240,7 +240,7 @@ HRESULT WINAPI WsCreateMessageForChannel( WS_CHANNEL *channel_handle, const WS_M ...@@ -240,7 +240,7 @@ HRESULT WINAPI WsCreateMessageForChannel( WS_CHANNEL *channel_handle, const WS_M
WS_ADDRESSING_VERSION version_addr; WS_ADDRESSING_VERSION version_addr;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %u %p %p\n", channel_handle, properties, count, handle, error ); TRACE( "%p %p %lu %p %p\n", channel_handle, properties, count, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!channel_handle || !handle) return E_INVALIDARG; if (!channel_handle || !handle) return E_INVALIDARG;
...@@ -307,7 +307,7 @@ HRESULT WINAPI WsResetMessage( WS_MESSAGE *handle, WS_ERROR *error ) ...@@ -307,7 +307,7 @@ HRESULT WINAPI WsResetMessage( WS_MESSAGE *handle, WS_ERROR *error )
reset_msg( msg ); reset_msg( msg );
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -320,7 +320,7 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID ...@@ -320,7 +320,7 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID
struct msg *msg = (struct msg *)handle; struct msg *msg = (struct msg *)handle;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!msg) return E_INVALIDARG; if (!msg) return E_INVALIDARG;
...@@ -380,7 +380,7 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID ...@@ -380,7 +380,7 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID
} }
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -393,7 +393,7 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID ...@@ -393,7 +393,7 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID
struct msg *msg = (struct msg *)handle; struct msg *msg = (struct msg *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %u\n", handle, id, value, size ); TRACE( "%p %u %p %lu %p\n", handle, id, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!msg) return E_INVALIDARG; if (!msg) return E_INVALIDARG;
...@@ -421,7 +421,7 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID ...@@ -421,7 +421,7 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID
} }
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -464,7 +464,7 @@ HRESULT WINAPI WsAddressMessage( WS_MESSAGE *handle, const WS_ENDPOINT_ADDRESS * ...@@ -464,7 +464,7 @@ HRESULT WINAPI WsAddressMessage( WS_MESSAGE *handle, const WS_ENDPOINT_ADDRESS *
if (hr == S_OK) msg->is_addressed = TRUE; if (hr == S_OK) msg->is_addressed = TRUE;
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -760,7 +760,7 @@ HRESULT WINAPI WsWriteEnvelopeStart( WS_MESSAGE *handle, WS_XML_WRITER *writer, ...@@ -760,7 +760,7 @@ HRESULT WINAPI WsWriteEnvelopeStart( WS_MESSAGE *handle, WS_XML_WRITER *writer,
} }
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -790,7 +790,7 @@ HRESULT WINAPI WsWriteEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) ...@@ -790,7 +790,7 @@ HRESULT WINAPI WsWriteEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error )
msg->state = WS_MESSAGE_STATE_DONE; msg->state = WS_MESSAGE_STATE_DONE;
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -803,7 +803,7 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de ...@@ -803,7 +803,7 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de
struct msg *msg = (struct msg *)handle; struct msg *msg = (struct msg *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %08x %p %u %p\n", handle, desc, option, value, size, error ); TRACE( "%p %p %u %p %lu %p\n", handle, desc, option, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!msg || !desc) return E_INVALIDARG; if (!msg || !desc) return E_INVALIDARG;
...@@ -833,7 +833,7 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de ...@@ -833,7 +833,7 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de
done: done:
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -845,7 +845,7 @@ HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTE ...@@ -845,7 +845,7 @@ HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTE
struct msg *msg = (struct msg *)handle; struct msg *msg = (struct msg *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %p\n", handle, size, ctx, error ); TRACE( "%p %lu %p %p\n", handle, size, ctx, error );
if (!msg) return E_INVALIDARG; if (!msg) return E_INVALIDARG;
...@@ -860,7 +860,7 @@ HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTE ...@@ -860,7 +860,7 @@ HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTE
hr = WsFlushWriter( msg->writer_body, size, ctx, error ); hr = WsFlushWriter( msg->writer_body, size, ctx, error );
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -967,7 +967,7 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W ...@@ -967,7 +967,7 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W
} }
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -997,7 +997,7 @@ HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) ...@@ -997,7 +997,7 @@ HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error )
msg->state = WS_MESSAGE_STATE_DONE; msg->state = WS_MESSAGE_STATE_DONE;
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1010,7 +1010,7 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des ...@@ -1010,7 +1010,7 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des
struct msg *msg = (struct msg *)handle; struct msg *msg = (struct msg *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %08x %p %p %u %p\n", handle, desc, option, heap, value, size, error ); TRACE( "%p %p %u %p %p %lu %p\n", handle, desc, option, heap, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!msg || !desc) return E_INVALIDARG; if (!msg || !desc) return E_INVALIDARG;
...@@ -1027,7 +1027,7 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des ...@@ -1027,7 +1027,7 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des
else hr = WsReadElement( msg->reader_body, desc, option, heap, value, size, NULL ); else hr = WsReadElement( msg->reader_body, desc, option, heap, value, size, NULL );
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1039,7 +1039,7 @@ HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEX ...@@ -1039,7 +1039,7 @@ HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEX
struct msg *msg = (struct msg *)handle; struct msg *msg = (struct msg *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %p\n", handle, size, ctx, error ); TRACE( "%p %lu %p %p\n", handle, size, ctx, error );
if (!msg) return E_INVALIDARG; if (!msg) return E_INVALIDARG;
...@@ -1054,7 +1054,7 @@ HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEX ...@@ -1054,7 +1054,7 @@ HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEX
hr = WsFillReader( msg->reader_body, size, ctx, error ); hr = WsFillReader( msg->reader_body, size, ctx, error );
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1093,7 +1093,7 @@ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATIO ...@@ -1093,7 +1093,7 @@ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATIO
} }
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1194,7 +1194,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val ...@@ -1194,7 +1194,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val
HRESULT hr; HRESULT hr;
ULONG i; ULONG i;
TRACE( "%p %u %u %08x %p %u %p\n", handle, type, value_type, option, value, size, error ); TRACE( "%p %u %u %u %p %lu %p\n", handle, type, value_type, option, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!msg || type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) return E_INVALIDARG; if (!msg || type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) return E_INVALIDARG;
...@@ -1239,7 +1239,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val ...@@ -1239,7 +1239,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val
done: done:
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1288,7 +1288,7 @@ HRESULT WINAPI WsGetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val ...@@ -1288,7 +1288,7 @@ HRESULT WINAPI WsGetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val
struct msg *msg = (struct msg *)handle; struct msg *msg = (struct msg *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %u %08x %p %p %u %p\n", handle, type, value_type, option, heap, value, size, error ); TRACE( "%p %u %u %u %p %p %lu %p\n", handle, type, value_type, option, heap, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!msg || type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER || option < WS_READ_REQUIRED_VALUE || if (!msg || type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER || option < WS_READ_REQUIRED_VALUE ||
...@@ -1306,7 +1306,7 @@ HRESULT WINAPI WsGetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val ...@@ -1306,7 +1306,7 @@ HRESULT WINAPI WsGetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val
else hr = get_standard_header( msg, type, value_type, option, heap, value, size ); else hr = get_standard_header( msg, type, value_type, option, heap, value, size );
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1357,7 +1357,7 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR ...@@ -1357,7 +1357,7 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR
} }
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1490,7 +1490,7 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, ...@@ -1490,7 +1490,7 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name,
struct msg *msg = (struct msg *)handle; struct msg *msg = (struct msg *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %s %u %08x %p %u %p\n", handle, debugstr_xmlstr(name), type, option, value, size, error ); TRACE( "%p %s %u %u %p %lu %p\n", handle, debugstr_xmlstr(name), type, option, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!msg || !name) return E_INVALIDARG; if (!msg || !name) return E_INVALIDARG;
...@@ -1507,7 +1507,7 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, ...@@ -1507,7 +1507,7 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name,
else hr = add_mapped_header( msg, name, type, option, value, size ); else hr = add_mapped_header( msg, name, type, option, value, size );
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1548,7 +1548,7 @@ HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *na ...@@ -1548,7 +1548,7 @@ HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *na
} }
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1636,7 +1636,7 @@ HRESULT WINAPI WsGetMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, ...@@ -1636,7 +1636,7 @@ HRESULT WINAPI WsGetMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name,
struct msg *msg = (struct msg *)handle; struct msg *msg = (struct msg *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %s %u %u %u %u %p %p %u %p\n", handle, debugstr_xmlstr(name), option, index, type, read_option, TRACE( "%p %s %u %lu %u %u %p %p %lu %p\n", handle, debugstr_xmlstr(name), option, index, type, read_option,
heap, value, size, error ); heap, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (option != WS_SINGLETON_HEADER) if (option != WS_SINGLETON_HEADER)
...@@ -1659,7 +1659,7 @@ HRESULT WINAPI WsGetMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, ...@@ -1659,7 +1659,7 @@ HRESULT WINAPI WsGetMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name,
else hr = get_mapped_header( msg, name, type, read_option, heap, value, size ); else hr = get_mapped_header( msg, name, type, read_option, heap, value, size );
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1707,7 +1707,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI ...@@ -1707,7 +1707,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI
struct header *header; struct header *header;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %08x %p %u %08x %p\n", handle, desc, option, value, size, attrs, error ); TRACE( "%p %p %u %p %lu %#lx %p\n", handle, desc, option, value, size, attrs, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!msg || !desc) return E_INVALIDARG; if (!msg || !desc) return E_INVALIDARG;
...@@ -1734,7 +1734,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI ...@@ -1734,7 +1734,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI
done: done:
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1761,7 +1761,7 @@ HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI ...@@ -1761,7 +1761,7 @@ HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI
struct msg *msg = (struct msg *)handle; struct msg *msg = (struct msg *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %08x %u %08x %p %p %u %p %p\n", handle, desc, repeat_option, index, option, heap, value, TRACE( "%p %p %u %lu %u %p %p %lu %p %p\n", handle, desc, repeat_option, index, option, heap, value,
size, attrs, error ); size, attrs, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
...@@ -1791,7 +1791,7 @@ HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI ...@@ -1791,7 +1791,7 @@ HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI
else hr = get_custom_header( msg, desc, option, heap, value, size ); else hr = get_custom_header( msg, desc, option, heap, value, size );
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1837,7 +1837,7 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na ...@@ -1837,7 +1837,7 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na
} }
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1993,7 +1993,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) ...@@ -1993,7 +1993,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req )
done: done:
free( header ); free( header );
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2051,7 +2051,7 @@ HRESULT message_map_http_response_headers( WS_MESSAGE *handle, HINTERNET req, co ...@@ -2051,7 +2051,7 @@ HRESULT message_map_http_response_headers( WS_MESSAGE *handle, HINTERNET req, co
hr = map_http_response_headers( msg, req, mapping ); hr = map_http_response_headers( msg, req, mapping );
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2108,7 +2108,7 @@ void message_do_send_callback( WS_MESSAGE *handle ) ...@@ -2108,7 +2108,7 @@ void message_do_send_callback( WS_MESSAGE *handle )
HRESULT hr; HRESULT hr;
TRACE( "executing callback %p\n", msg->ctx_send.callback ); TRACE( "executing callback %p\n", msg->ctx_send.callback );
hr = msg->ctx_send.callback( handle, msg->heap, msg->ctx_send.state, NULL ); hr = msg->ctx_send.callback( handle, msg->heap, msg->ctx_send.state, NULL );
TRACE( "callback %p returned %08x\n", msg->ctx_send.callback, hr ); TRACE( "callback %p returned %#lx\n", msg->ctx_send.callback, hr );
} }
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
...@@ -2131,7 +2131,7 @@ void message_do_receive_callback( WS_MESSAGE *handle ) ...@@ -2131,7 +2131,7 @@ void message_do_receive_callback( WS_MESSAGE *handle )
HRESULT hr; HRESULT hr;
TRACE( "executing callback %p\n", msg->ctx_receive.callback ); TRACE( "executing callback %p\n", msg->ctx_receive.callback );
hr = msg->ctx_receive.callback( handle, msg->heap, msg->ctx_receive.state, NULL ); hr = msg->ctx_receive.callback( handle, msg->heap, msg->ctx_receive.state, NULL );
TRACE( "callback %p returned %08x\n", msg->ctx_receive.callback, hr ); TRACE( "callback %p returned %#lx\n", msg->ctx_receive.callback, hr );
} }
LeaveCriticalSection( &msg->cs ); LeaveCriticalSection( &msg->cs );
......
dlls/webservices/proxy.c
View file @ 338f1458
...@@ -125,7 +125,7 @@ HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNE ...@@ -125,7 +125,7 @@ HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNE
WS_CHANNEL *channel; WS_CHANNEL *channel;
HRESULT hr; HRESULT hr;
TRACE( "%u %u %p %p %u %p %u %p %p\n", type, binding, desc, proxy_props, proxy_props_count, TRACE( "%u %u %p %p %lu %p %lu %p %p\n", type, binding, desc, proxy_props, proxy_props_count,
channel_props, channel_props_count, handle, error ); channel_props, channel_props_count, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (desc) FIXME( "ignoring security description\n" ); if (desc) FIXME( "ignoring security description\n" );
...@@ -160,7 +160,7 @@ HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, ...@@ -160,7 +160,7 @@ HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type,
WS_CHANNEL *channel; WS_CHANNEL *channel;
HRESULT hr; HRESULT hr;
TRACE( "%u %p %u %u %p %u %p %u %p %p\n", channel_type, properties, count, type, value, size, desc, TRACE( "%u %p %lu %u %p %lu %p %lu %p %p\n", channel_type, properties, count, type, value, size, desc,
desc_size, handle, error ); desc_size, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
...@@ -236,7 +236,7 @@ HRESULT WINAPI WsResetServiceProxy( WS_SERVICE_PROXY *handle, WS_ERROR *error ) ...@@ -236,7 +236,7 @@ HRESULT WINAPI WsResetServiceProxy( WS_SERVICE_PROXY *handle, WS_ERROR *error )
reset_proxy( proxy ); reset_proxy( proxy );
LeaveCriticalSection( &proxy->cs ); LeaveCriticalSection( &proxy->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -274,7 +274,7 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO ...@@ -274,7 +274,7 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO
struct proxy *proxy = (struct proxy *)handle; struct proxy *proxy = (struct proxy *)handle;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!proxy) return E_INVALIDARG; if (!proxy) return E_INVALIDARG;
...@@ -299,7 +299,7 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO ...@@ -299,7 +299,7 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO
} }
LeaveCriticalSection( &proxy->cs ); LeaveCriticalSection( &proxy->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -330,7 +330,7 @@ HRESULT WINAPI WsOpenServiceProxy( WS_SERVICE_PROXY *handle, const WS_ENDPOINT_A ...@@ -330,7 +330,7 @@ HRESULT WINAPI WsOpenServiceProxy( WS_SERVICE_PROXY *handle, const WS_ENDPOINT_A
proxy->state = WS_SERVICE_PROXY_STATE_OPEN; proxy->state = WS_SERVICE_PROXY_STATE_OPEN;
LeaveCriticalSection( &proxy->cs ); LeaveCriticalSection( &proxy->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -360,7 +360,7 @@ HRESULT WINAPI WsCloseServiceProxy( WS_SERVICE_PROXY *handle, const WS_ASYNC_CON ...@@ -360,7 +360,7 @@ HRESULT WINAPI WsCloseServiceProxy( WS_SERVICE_PROXY *handle, const WS_ASYNC_CON
proxy->state = WS_SERVICE_PROXY_STATE_CLOSED; proxy->state = WS_SERVICE_PROXY_STATE_CLOSED;
LeaveCriticalSection( &proxy->cs ); LeaveCriticalSection( &proxy->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -505,7 +505,7 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION ...@@ -505,7 +505,7 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION
HRESULT hr; HRESULT hr;
ULONG i; ULONG i;
TRACE( "%p %p %p %p %p %u %p %p\n", handle, desc, args, heap, properties, count, ctx, error ); TRACE( "%p %p %p %p %p %lu %p %p\n", handle, desc, args, heap, properties, count, ctx, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (ctx) FIXME( "ignoring ctx parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" );
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
...@@ -542,6 +542,6 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION ...@@ -542,6 +542,6 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION
done: done:
WsFreeMessage( msg ); WsFreeMessage( msg );
LeaveCriticalSection( &proxy->cs ); LeaveCriticalSection( &proxy->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
dlls/webservices/reader.c
View file @ 338f1458
...@@ -561,7 +561,7 @@ HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG c ...@@ -561,7 +561,7 @@ HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG c
BOOL read_decl = TRUE; BOOL read_decl = TRUE;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %p\n", properties, count, handle, error ); TRACE( "%p %lu %p %p\n", properties, count, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!handle) return E_INVALIDARG; if (!handle) return E_INVALIDARG;
...@@ -651,7 +651,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY ...@@ -651,7 +651,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY
struct reader *reader = (struct reader *)handle; struct reader *reader = (struct reader *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); TRACE( "%p %lu %p %p\n", handle, min_size, ctx, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (ctx) FIXME( "ignoring ctx parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" );
...@@ -677,7 +677,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY ...@@ -677,7 +677,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY
} }
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -754,7 +754,7 @@ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STR ...@@ -754,7 +754,7 @@ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STR
} }
} }
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -783,7 +783,7 @@ HRESULT WINAPI WsGetReaderNode( WS_XML_READER *handle, const WS_XML_NODE **node, ...@@ -783,7 +783,7 @@ HRESULT WINAPI WsGetReaderNode( WS_XML_READER *handle, const WS_XML_NODE **node,
*node = &reader->current->hdr.node; *node = &reader->current->hdr.node;
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return S_OK; return S_OK;
} }
...@@ -804,7 +804,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT ...@@ -804,7 +804,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT
struct reader *reader = (struct reader *)handle; struct reader *reader = (struct reader *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!reader) return E_INVALIDARG; if (!reader) return E_INVALIDARG;
...@@ -822,7 +822,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT ...@@ -822,7 +822,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT
else hr = prop_get( reader->prop, reader->prop_count, id, buf, size ); else hr = prop_get( reader->prop, reader->prop_count, id, buf, size );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -3161,7 +3161,7 @@ HRESULT WINAPI WsReadEndElement( WS_XML_READER *handle, WS_ERROR *error ) ...@@ -3161,7 +3161,7 @@ HRESULT WINAPI WsReadEndElement( WS_XML_READER *handle, WS_ERROR *error )
hr = read_endelement( reader ); hr = read_endelement( reader );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -3189,7 +3189,7 @@ HRESULT WINAPI WsReadNode( WS_XML_READER *handle, WS_ERROR *error ) ...@@ -3189,7 +3189,7 @@ HRESULT WINAPI WsReadNode( WS_XML_READER *handle, WS_ERROR *error )
hr = read_node( reader ); hr = read_node( reader );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -3236,7 +3236,7 @@ HRESULT WINAPI WsSkipNode( WS_XML_READER *handle, WS_ERROR *error ) ...@@ -3236,7 +3236,7 @@ HRESULT WINAPI WsSkipNode( WS_XML_READER *handle, WS_ERROR *error )
hr = skip_node( reader ); hr = skip_node( reader );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -3264,7 +3264,7 @@ HRESULT WINAPI WsReadStartElement( WS_XML_READER *handle, WS_ERROR *error ) ...@@ -3264,7 +3264,7 @@ HRESULT WINAPI WsReadStartElement( WS_XML_READER *handle, WS_ERROR *error )
hr = read_startelement( reader ); hr = read_startelement( reader );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -3294,7 +3294,7 @@ HRESULT WINAPI WsReadToStartElement( WS_XML_READER *handle, const WS_XML_STRING ...@@ -3294,7 +3294,7 @@ HRESULT WINAPI WsReadToStartElement( WS_XML_READER *handle, const WS_XML_STRING
hr = read_to_startelement( reader, found ); hr = read_to_startelement( reader, found );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -3595,7 +3595,7 @@ HRESULT WINAPI WsMoveReader( WS_XML_READER *handle, WS_MOVE_TO move, BOOL *found ...@@ -3595,7 +3595,7 @@ HRESULT WINAPI WsMoveReader( WS_XML_READER *handle, WS_MOVE_TO move, BOOL *found
else hr = read_move_to( reader, move, found ); else hr = read_move_to( reader, move, found );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -3608,7 +3608,7 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO ...@@ -3608,7 +3608,7 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO
const WS_XML_ELEMENT_NODE *elem; const WS_XML_ELEMENT_NODE *elem;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %u %p\n", handle, index, error ); TRACE( "%p %lu %p\n", handle, index, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!reader) return E_INVALIDARG; if (!reader) return E_INVALIDARG;
...@@ -3630,7 +3630,7 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO ...@@ -3630,7 +3630,7 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO
} }
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return S_OK; return S_OK;
} }
...@@ -3659,7 +3659,7 @@ HRESULT WINAPI WsReadEndAttribute( WS_XML_READER *handle, WS_ERROR *error ) ...@@ -3659,7 +3659,7 @@ HRESULT WINAPI WsReadEndAttribute( WS_XML_READER *handle, WS_ERROR *error )
else reader->state = READER_STATE_STARTELEMENT; else reader->state = READER_STATE_STARTELEMENT;
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4053,7 +4053,7 @@ HRESULT WINAPI WsReadQualifiedName( WS_XML_READER *handle, WS_HEAP *heap, WS_XML ...@@ -4053,7 +4053,7 @@ HRESULT WINAPI WsReadQualifiedName( WS_XML_READER *handle, WS_HEAP *heap, WS_XML
else hr = read_qualified_name( reader, heap, prefix, localname, ns ); else hr = read_qualified_name( reader, heap, prefix, localname, ns );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4283,7 +4283,7 @@ HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *loca ...@@ -4283,7 +4283,7 @@ HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *loca
} }
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -6296,7 +6296,7 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO ...@@ -6296,7 +6296,7 @@ static HRESULT read_type_array( struct reader *reader, const WS_FIELD_DESCRIPTIO
if (desc->itemRange && (nb_items < desc->itemRange->minItemCount || nb_items > desc->itemRange->maxItemCount)) if (desc->itemRange && (nb_items < desc->itemRange->minItemCount || nb_items > desc->itemRange->maxItemCount))
{ {
TRACE( "number of items %u out of range (%u-%u)\n", nb_items, desc->itemRange->minItemCount, TRACE( "number of items %lu out of range (%lu-%lu)\n", nb_items, desc->itemRange->minItemCount,
desc->itemRange->maxItemCount ); desc->itemRange->maxItemCount );
ws_free( heap, buf, nb_allocated * item_size ); ws_free( heap, buf, nb_allocated * item_size );
return WS_E_INVALID_FORMAT; return WS_E_INVALID_FORMAT;
...@@ -6341,7 +6341,7 @@ static HRESULT read_type_field( struct reader *reader, const WS_STRUCT_DESCRIPTI ...@@ -6341,7 +6341,7 @@ static HRESULT read_type_field( struct reader *reader, const WS_STRUCT_DESCRIPTI
if (!desc) return E_INVALIDARG; if (!desc) return E_INVALIDARG;
if (desc->options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) if (desc->options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM))
{ {
FIXME( "options %08x not supported\n", desc->options ); FIXME( "options %#lx not supported\n", desc->options );
return E_NOTIMPL; return E_NOTIMPL;
} }
if (!(option = get_field_read_option( desc->type, desc->options ))) return E_INVALIDARG; if (!(option = get_field_read_option( desc->type, desc->options ))) return E_INVALIDARG;
...@@ -6430,7 +6430,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, ...@@ -6430,7 +6430,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping,
if (!desc) return E_INVALIDARG; if (!desc) return E_INVALIDARG;
if (desc->structOptions & ~WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT) if (desc->structOptions & ~WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT)
{ {
FIXME( "struct options %08x not supported\n", FIXME( "struct options %#lx not supported\n",
desc->structOptions & ~WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT ); desc->structOptions & ~WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT );
} }
...@@ -6716,7 +6716,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY ...@@ -6716,7 +6716,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY
BOOL found; BOOL found;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %u %p %u %p %p %u %p\n", handle, mapping, type, desc, option, heap, value, TRACE( "%p %u %u %p %#x %p %p %lu %p\n", handle, mapping, type, desc, option, heap, value,
size, error ); size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
...@@ -6745,7 +6745,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY ...@@ -6745,7 +6745,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY
} }
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -6783,7 +6783,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO ...@@ -6783,7 +6783,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO
BOOL found; BOOL found;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); TRACE( "%p %p %#x %p %p %lu %p\n", handle, desc, option, heap, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!reader || !desc || !value) return E_INVALIDARG; if (!reader || !desc || !value) return E_INVALIDARG;
...@@ -6800,7 +6800,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO ...@@ -6800,7 +6800,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO
desc->elementNs, desc->typeDescription, option, heap, value, size, &found ); desc->elementNs, desc->typeDescription, option, heap, value, size, &found );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -6815,7 +6815,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi ...@@ -6815,7 +6815,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi
BOOL found; BOOL found;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %u %p\n", handle, type, value, size, error ); TRACE( "%p %u %p %lu %p\n", handle, type, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!reader || !value || type == ~0u) return E_INVALIDARG; if (!reader || !value || type == ~0u) return E_INVALIDARG;
...@@ -6832,7 +6832,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi ...@@ -6832,7 +6832,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi
NULL, value, size, &found ); NULL, value, size, &found );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -6847,7 +6847,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI ...@@ -6847,7 +6847,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI
BOOL found; BOOL found;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); TRACE( "%p %p %#x %p %p %lu %p\n", handle, desc, option, heap, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!reader || !desc || !value) return E_INVALIDARG; if (!reader || !desc || !value) return E_INVALIDARG;
...@@ -6865,7 +6865,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI ...@@ -6865,7 +6865,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI
desc->attributeNs, desc->typeDescription, option, heap, value, size, &found ); desc->attributeNs, desc->typeDescription, option, heap, value, size, &found );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -6968,7 +6968,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * ...@@ -6968,7 +6968,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING *
ULONG i, offset = 0; ULONG i, offset = 0;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %p %p %u %p\n", handle, encoding, input, properties, count, error ); TRACE( "%p %p %p %p %lu %p\n", handle, encoding, input, properties, count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!reader) return E_INVALIDARG; if (!reader) return E_INVALIDARG;
...@@ -7051,7 +7051,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * ...@@ -7051,7 +7051,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING *
done: done:
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -7099,7 +7099,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, ...@@ -7099,7 +7099,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer,
HRESULT hr; HRESULT hr;
ULONG i; ULONG i;
TRACE( "%p %p %p %u %p\n", handle, buffer, properties, count, error ); TRACE( "%p %p %p %lu %p\n", handle, buffer, properties, count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!reader || !xmlbuf) return E_INVALIDARG; if (!reader || !xmlbuf) return E_INVALIDARG;
...@@ -7127,7 +7127,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, ...@@ -7127,7 +7127,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer,
done: done:
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -7160,7 +7160,7 @@ HRESULT WINAPI WsGetReaderPosition( WS_XML_READER *handle, WS_XML_NODE_POSITION ...@@ -7160,7 +7160,7 @@ HRESULT WINAPI WsGetReaderPosition( WS_XML_READER *handle, WS_XML_NODE_POSITION
} }
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -7189,7 +7189,7 @@ HRESULT WINAPI WsSetReaderPosition( WS_XML_READER *handle, const WS_XML_NODE_POS ...@@ -7189,7 +7189,7 @@ HRESULT WINAPI WsSetReaderPosition( WS_XML_READER *handle, const WS_XML_NODE_POS
else reader->current = pos->node; else reader->current = pos->node;
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -7209,7 +7209,7 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, ...@@ -7209,7 +7209,7 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count,
struct reader *reader = (struct reader *)handle; struct reader *reader = (struct reader *)handle;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %p %u %p %p\n", handle, bytes, max_count, count, error ); TRACE( "%p %p %lu %p %p\n", handle, bytes, max_count, count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!reader) return E_INVALIDARG; if (!reader) return E_INVALIDARG;
...@@ -7254,7 +7254,7 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, ...@@ -7254,7 +7254,7 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count,
done: done:
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -7275,7 +7275,7 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count ...@@ -7275,7 +7275,7 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count
struct reader *reader = (struct reader *)handle; struct reader *reader = (struct reader *)handle;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %p %u %p %p\n", handle, chars, max_count, count, error ); TRACE( "%p %p %lu %p %p\n", handle, chars, max_count, count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!reader) return E_INVALIDARG; if (!reader) return E_INVALIDARG;
...@@ -7321,7 +7321,7 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count ...@@ -7321,7 +7321,7 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count
done: done:
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -7333,7 +7333,7 @@ HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_co ...@@ -7333,7 +7333,7 @@ HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_co
struct reader *reader = (struct reader *)handle; struct reader *reader = (struct reader *)handle;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %p %u %p %p\n", handle, bytes, max_count, count, error ); TRACE( "%p %p %lu %p %p\n", handle, bytes, max_count, count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!reader) return E_INVALIDARG; if (!reader) return E_INVALIDARG;
...@@ -7375,7 +7375,7 @@ HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_co ...@@ -7375,7 +7375,7 @@ HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_co
done: done:
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -7443,7 +7443,7 @@ done: ...@@ -7443,7 +7443,7 @@ done:
if (hr != S_OK) free_xmlbuf( (struct xmlbuf *)buffer ); if (hr != S_OK) free_xmlbuf( (struct xmlbuf *)buffer );
WsFreeWriter( writer ); WsFreeWriter( writer );
LeaveCriticalSection( &reader->cs ); LeaveCriticalSection( &reader->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
......
dlls/webservices/url.c
View file @ 338f1458
...@@ -176,14 +176,14 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS ...@@ -176,14 +176,14 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS
WS_HTTP_URL *url = NULL; WS_HTTP_URL *url = NULL;
ULONG len, len_decoded, port = 0; ULONG len, len_decoded, port = 0;
TRACE( "%s %08x %p %p %p\n", str ? debugstr_wn(str->chars, str->length) : "null", flags, heap, ret, error ); TRACE( "%s %#lx %p %p %p\n", str ? debugstr_wn(str->chars, str->length) : "null", flags, heap, ret, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!str || !heap) return E_INVALIDARG; if (!str || !heap) return E_INVALIDARG;
if (!str->length) return WS_E_INVALID_FORMAT; if (!str->length) return WS_E_INVALID_FORMAT;
if (flags) if (flags)
{ {
FIXME( "unimplemented flags %08x\n", flags ); FIXME( "unimplemented flags %#lx\n", flags );
return E_NOTIMPL; return E_NOTIMPL;
} }
if (!(decoded = url_decode( str->chars, str->length, heap, &len_decoded )) || if (!(decoded = url_decode( str->chars, str->length, heap, &len_decoded )) ||
...@@ -269,7 +269,7 @@ done: ...@@ -269,7 +269,7 @@ done:
if (decoded != str->chars) ws_free( heap, decoded, len_decoded ); if (decoded != str->chars) ws_free( heap, decoded, len_decoded );
ws_free( heap, url, sizeof(*url) ); ws_free( heap, url, sizeof(*url) );
} }
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -433,13 +433,13 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S ...@@ -433,13 +433,13 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S
ULONG port = 0; ULONG port = 0;
HRESULT hr = WS_E_INVALID_FORMAT; HRESULT hr = WS_E_INVALID_FORMAT;
TRACE( "%p %08x %p %p %p\n", base, flags, heap, ret, error ); TRACE( "%p %#lx %p %p %p\n", base, flags, heap, ret, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!url || !heap || !ret) return E_INVALIDARG; if (!url || !heap || !ret) return E_INVALIDARG;
if (flags) if (flags)
{ {
FIXME( "unimplemented flags %08x\n", flags ); FIXME( "unimplemented flags %#lx\n", flags );
return E_NOTIMPL; return E_NOTIMPL;
} }
if (!(scheme = scheme_str( url->url.scheme, &len_scheme ))) goto done; if (!(scheme = scheme_str( url->url.scheme, &len_scheme ))) goto done;
...@@ -534,6 +534,6 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S ...@@ -534,6 +534,6 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S
done: done:
if (hr != S_OK) ws_free( heap, str, ret_size ); if (hr != S_OK) ws_free( heap, str, ret_size );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
dlls/webservices/writer.c
View file @ 338f1458
...@@ -195,7 +195,7 @@ HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG c ...@@ -195,7 +195,7 @@ HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG c
WS_CHARSET charset = WS_CHARSET_UTF8; WS_CHARSET charset = WS_CHARSET_UTF8;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %p\n", properties, count, handle, error ); TRACE( "%p %lu %p %p\n", properties, count, handle, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!handle) return E_INVALIDARG; if (!handle) return E_INVALIDARG;
...@@ -273,7 +273,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT ...@@ -273,7 +273,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT
struct writer *writer = (struct writer *)handle; struct writer *writer = (struct writer *)handle;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); TRACE( "%p %u %p %lu %p\n", handle, id, buf, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!writer) return E_INVALIDARG; if (!writer) return E_INVALIDARG;
...@@ -321,7 +321,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT ...@@ -321,7 +321,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT
} }
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -359,7 +359,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING ...@@ -359,7 +359,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING
HRESULT hr; HRESULT hr;
ULONG i; ULONG i;
TRACE( "%p %p %p %p %u %p\n", handle, encoding, output, properties, count, error ); TRACE( "%p %p %p %p %lu %p\n", handle, encoding, output, properties, count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!writer) return E_INVALIDARG; if (!writer) return E_INVALIDARG;
...@@ -450,7 +450,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING ...@@ -450,7 +450,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING
done: done:
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -467,7 +467,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer ...@@ -467,7 +467,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer
HRESULT hr; HRESULT hr;
ULONG i; ULONG i;
TRACE( "%p %p %p %u %p\n", handle, buffer, properties, count, error ); TRACE( "%p %p %p %lu %p\n", handle, buffer, properties, count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!writer || !xmlbuf) return E_INVALIDARG; if (!writer || !xmlbuf) return E_INVALIDARG;
...@@ -498,7 +498,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer ...@@ -498,7 +498,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer
done: done:
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -525,7 +525,7 @@ HRESULT WINAPI WsFlushWriter( WS_XML_WRITER *handle, ULONG min_size, const WS_AS ...@@ -525,7 +525,7 @@ HRESULT WINAPI WsFlushWriter( WS_XML_WRITER *handle, ULONG min_size, const WS_AS
struct writer *writer = (struct writer *)handle; struct writer *writer = (struct writer *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %p %p\n", handle, min_size, ctx, error ); TRACE( "%p %lu %p %p\n", handle, min_size, ctx, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (ctx) FIXME( "ignoring ctx parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" );
...@@ -543,7 +543,7 @@ HRESULT WINAPI WsFlushWriter( WS_XML_WRITER *handle, ULONG min_size, const WS_AS ...@@ -543,7 +543,7 @@ HRESULT WINAPI WsFlushWriter( WS_XML_WRITER *handle, ULONG min_size, const WS_AS
else hr = flush_writer( writer, min_size, ctx, error ); else hr = flush_writer( writer, min_size, ctx, error );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1536,7 +1536,7 @@ HRESULT WINAPI WsGetPrefixFromNamespace( WS_XML_WRITER *handle, const WS_XML_STR ...@@ -1536,7 +1536,7 @@ HRESULT WINAPI WsGetPrefixFromNamespace( WS_XML_WRITER *handle, const WS_XML_STR
} }
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1733,7 +1733,7 @@ HRESULT WINAPI WsWriteEndAttribute( WS_XML_WRITER *handle, WS_ERROR *error ) ...@@ -1733,7 +1733,7 @@ HRESULT WINAPI WsWriteEndAttribute( WS_XML_WRITER *handle, WS_ERROR *error )
writer->state = WRITER_STATE_STARTELEMENT; writer->state = WRITER_STATE_STARTELEMENT;
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -1976,7 +1976,7 @@ HRESULT WINAPI WsWriteEndElement( WS_XML_WRITER *handle, WS_ERROR *error ) ...@@ -1976,7 +1976,7 @@ HRESULT WINAPI WsWriteEndElement( WS_XML_WRITER *handle, WS_ERROR *error )
hr = write_endelement_node( writer ); hr = write_endelement_node( writer );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2032,7 +2032,7 @@ HRESULT WINAPI WsWriteEndStartElement( WS_XML_WRITER *handle, WS_ERROR *error ) ...@@ -2032,7 +2032,7 @@ HRESULT WINAPI WsWriteEndStartElement( WS_XML_WRITER *handle, WS_ERROR *error )
done: done:
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2101,7 +2101,7 @@ HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING ...@@ -2101,7 +2101,7 @@ HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING
writer->state = WRITER_STATE_STARTATTRIBUTE; writer->state = WRITER_STATE_STARTATTRIBUTE;
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2180,7 +2180,7 @@ HRESULT WINAPI WsWriteStartCData( WS_XML_WRITER *handle, WS_ERROR *error ) ...@@ -2180,7 +2180,7 @@ HRESULT WINAPI WsWriteStartCData( WS_XML_WRITER *handle, WS_ERROR *error )
hr = write_cdata_node( writer ); hr = write_cdata_node( writer );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2226,7 +2226,7 @@ HRESULT WINAPI WsWriteEndCData( WS_XML_WRITER *handle, WS_ERROR *error ) ...@@ -2226,7 +2226,7 @@ HRESULT WINAPI WsWriteEndCData( WS_XML_WRITER *handle, WS_ERROR *error )
else hr = write_endcdata_node( writer ); else hr = write_endcdata_node( writer );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2313,7 +2313,7 @@ HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING * ...@@ -2313,7 +2313,7 @@ HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING *
hr = write_element_node( writer, prefix, localname, ns ); hr = write_element_node( writer, prefix, localname, ns );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2969,7 +2969,7 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E ...@@ -2969,7 +2969,7 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E
else hr = write_text_node( writer, text ); else hr = write_text_node( writer, text );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -2982,7 +2982,7 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou ...@@ -2982,7 +2982,7 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou
WS_XML_BASE64_TEXT base64; WS_XML_BASE64_TEXT base64;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %u %p\n", handle, bytes, count, error ); TRACE( "%p %p %lu %p\n", handle, bytes, count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!writer) return E_INVALIDARG; if (!writer) return E_INVALIDARG;
...@@ -3007,7 +3007,7 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou ...@@ -3007,7 +3007,7 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou
} }
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -3020,7 +3020,7 @@ HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG co ...@@ -3020,7 +3020,7 @@ HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG co
WS_XML_UTF16_TEXT utf16; WS_XML_UTF16_TEXT utf16;
HRESULT hr; HRESULT hr;
TRACE( "%p %s %u %p\n", handle, debugstr_wn(chars, count), count, error ); TRACE( "%p %s %lu %p\n", handle, debugstr_wn(chars, count), count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!writer) return E_INVALIDARG; if (!writer) return E_INVALIDARG;
...@@ -3045,7 +3045,7 @@ HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG co ...@@ -3045,7 +3045,7 @@ HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG co
} }
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -3058,7 +3058,7 @@ HRESULT WINAPI WsWriteCharsUtf8( WS_XML_WRITER *handle, const BYTE *bytes, ULONG ...@@ -3058,7 +3058,7 @@ HRESULT WINAPI WsWriteCharsUtf8( WS_XML_WRITER *handle, const BYTE *bytes, ULONG
WS_XML_UTF8_TEXT utf8; WS_XML_UTF8_TEXT utf8;
HRESULT hr; HRESULT hr;
TRACE( "%p %s %u %p\n", handle, debugstr_an((const char *)bytes, count), count, error ); TRACE( "%p %s %lu %p\n", handle, debugstr_an((const char *)bytes, count), count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!writer) return E_INVALIDARG; if (!writer) return E_INVALIDARG;
...@@ -3083,7 +3083,7 @@ HRESULT WINAPI WsWriteCharsUtf8( WS_XML_WRITER *handle, const BYTE *bytes, ULONG ...@@ -3083,7 +3083,7 @@ HRESULT WINAPI WsWriteCharsUtf8( WS_XML_WRITER *handle, const BYTE *bytes, ULONG
} }
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -3768,7 +3768,7 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI ...@@ -3768,7 +3768,7 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI
if (field_options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM)) if (field_options & ~(WS_FIELD_POINTER|WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE|WS_FIELD_NILLABLE_ITEM))
{ {
FIXME( "options 0x%x not supported\n", desc->options ); FIXME( "options %#lx not supported\n", desc->options );
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -3883,7 +3883,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping ...@@ -3883,7 +3883,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping
HRESULT hr; HRESULT hr;
if (!desc) return E_INVALIDARG; if (!desc) return E_INVALIDARG;
if (desc->structOptions) FIXME( "struct options 0x%x not supported\n", desc->structOptions ); if (desc->structOptions) FIXME( "struct options %#lx not supported\n", desc->structOptions );
if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr; if ((hr = get_value_ptr( option, value, size, desc->size, &ptr )) != S_OK) return hr;
if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer ); if (option == WS_WRITE_NILLABLE_POINTER && !ptr) return write_add_nil_attribute( writer );
...@@ -4022,7 +4022,7 @@ HRESULT WINAPI WsWriteAttribute( WS_XML_WRITER *handle, const WS_ATTRIBUTE_DESCR ...@@ -4022,7 +4022,7 @@ HRESULT WINAPI WsWriteAttribute( WS_XML_WRITER *handle, const WS_ATTRIBUTE_DESCR
struct writer *writer = (struct writer *)handle; struct writer *writer = (struct writer *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %u %p %u %p\n", handle, desc, option, value, size, error ); TRACE( "%p %p %u %p %lu %p\n", handle, desc, option, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!writer || !desc || !desc->attributeLocalName || !desc->attributeNs || !value) if (!writer || !desc || !desc->attributeLocalName || !desc->attributeNs || !value)
...@@ -4044,7 +4044,7 @@ HRESULT WINAPI WsWriteAttribute( WS_XML_WRITER *handle, const WS_ATTRIBUTE_DESCR ...@@ -4044,7 +4044,7 @@ HRESULT WINAPI WsWriteAttribute( WS_XML_WRITER *handle, const WS_ATTRIBUTE_DESCR
} }
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4058,7 +4058,7 @@ HRESULT WINAPI WsWriteElement( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTI ...@@ -4058,7 +4058,7 @@ HRESULT WINAPI WsWriteElement( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTI
struct writer *writer = (struct writer *)handle; struct writer *writer = (struct writer *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %p %u %p %u %p\n", handle, desc, option, value, size, error ); TRACE( "%p %p %u %p %lu %p\n", handle, desc, option, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!writer || !desc || !desc->elementLocalName || !desc->elementNs || !value) if (!writer || !desc || !desc->elementLocalName || !desc->elementNs || !value)
...@@ -4081,7 +4081,7 @@ HRESULT WINAPI WsWriteElement( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTI ...@@ -4081,7 +4081,7 @@ HRESULT WINAPI WsWriteElement( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTI
done: done:
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4095,7 +4095,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T ...@@ -4095,7 +4095,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T
struct writer *writer = (struct writer *)handle; struct writer *writer = (struct writer *)handle;
HRESULT hr; HRESULT hr;
TRACE( "%p %u %u %p %u %p %u %p\n", handle, mapping, type, desc, option, value, TRACE( "%p %u %u %p %u %p %lu %p\n", handle, mapping, type, desc, option, value,
size, error ); size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
...@@ -4128,7 +4128,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T ...@@ -4128,7 +4128,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T
} }
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4168,7 +4168,7 @@ HRESULT WINAPI WsWriteValue( WS_XML_WRITER *handle, WS_VALUE_TYPE value_type, co ...@@ -4168,7 +4168,7 @@ HRESULT WINAPI WsWriteValue( WS_XML_WRITER *handle, WS_VALUE_TYPE value_type, co
HRESULT hr = S_OK; HRESULT hr = S_OK;
WS_TYPE type; WS_TYPE type;
TRACE( "%p %u %p %u %p\n", handle, value_type, value, size, error ); TRACE( "%p %u %p %lu %p\n", handle, value_type, value, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
if (!writer || !value || (type = map_value_type( value_type )) == ~0u) return E_INVALIDARG; if (!writer || !value || (type = map_value_type( value_type )) == ~0u) return E_INVALIDARG;
...@@ -4198,7 +4198,7 @@ HRESULT WINAPI WsWriteValue( WS_XML_WRITER *handle, WS_VALUE_TYPE value_type, co ...@@ -4198,7 +4198,7 @@ HRESULT WINAPI WsWriteValue( WS_XML_WRITER *handle, WS_VALUE_TYPE value_type, co
if (hr == S_OK) hr = write_type( writer, mapping, type, NULL, WS_WRITE_REQUIRED_VALUE, value, size ); if (hr == S_OK) hr = write_type( writer, mapping, type, NULL, WS_WRITE_REQUIRED_VALUE, value, size );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4214,7 +4214,7 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna ...@@ -4214,7 +4214,7 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna
ULONG type_size, i; ULONG type_size, i;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE( "%p %s %s %u %p %u %u %u %p\n", handle, debugstr_xmlstr(localname), debugstr_xmlstr(ns), TRACE( "%p %s %s %u %p %lu %lu %lu %p\n", handle, debugstr_xmlstr(localname), debugstr_xmlstr(ns),
value_type, array, size, offset, count, error ); value_type, array, size, offset, count, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
...@@ -4258,7 +4258,7 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna ...@@ -4258,7 +4258,7 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna
done: done:
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4297,7 +4297,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W ...@@ -4297,7 +4297,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W
done: done:
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4315,7 +4315,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu ...@@ -4315,7 +4315,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu
char *buf; char *buf;
ULONG i; ULONG i;
TRACE( "%p %p %p %p %u %p %p %p %p\n", handle, buffer, encoding, properties, count, heap, TRACE( "%p %p %p %p %lu %p %p %p %p\n", handle, buffer, encoding, properties, count, heap,
bytes, size, error ); bytes, size, error );
if (error) FIXME( "ignoring error parameter\n" ); if (error) FIXME( "ignoring error parameter\n" );
...@@ -4352,7 +4352,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu ...@@ -4352,7 +4352,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu
done: done:
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4384,7 +4384,7 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING ...@@ -4384,7 +4384,7 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING
hr = add_namespace_attribute( writer, prefix, ns, single ); hr = add_namespace_attribute( writer, prefix, ns, single );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4435,7 +4435,7 @@ HRESULT WINAPI WsWriteQualifiedName( WS_XML_WRITER *handle, const WS_XML_STRING ...@@ -4435,7 +4435,7 @@ HRESULT WINAPI WsWriteQualifiedName( WS_XML_WRITER *handle, const WS_XML_STRING
else hr = write_qualified_name( writer, prefix, localname, ns ); else hr = write_qualified_name( writer, prefix, localname, ns );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4535,7 +4535,7 @@ HRESULT WINAPI WsMoveWriter( WS_XML_WRITER *handle, WS_MOVE_TO move, BOOL *found ...@@ -4535,7 +4535,7 @@ HRESULT WINAPI WsMoveWriter( WS_XML_WRITER *handle, WS_MOVE_TO move, BOOL *found
else hr = write_move_to( writer, move, found ); else hr = write_move_to( writer, move, found );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4568,7 +4568,7 @@ HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION ...@@ -4568,7 +4568,7 @@ HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION
} }
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4597,7 +4597,7 @@ HRESULT WINAPI WsSetWriterPosition( WS_XML_WRITER *handle, const WS_XML_NODE_POS ...@@ -4597,7 +4597,7 @@ HRESULT WINAPI WsSetWriterPosition( WS_XML_WRITER *handle, const WS_XML_NODE_POS
else writer->current = pos->node; else writer->current = pos->node;
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4757,7 +4757,7 @@ HRESULT WINAPI WsWriteNode( WS_XML_WRITER *handle, const WS_XML_NODE *node, WS_E ...@@ -4757,7 +4757,7 @@ HRESULT WINAPI WsWriteNode( WS_XML_WRITER *handle, const WS_XML_NODE *node, WS_E
else hr = write_node( writer, node ); else hr = write_node( writer, node );
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
...@@ -4888,7 +4888,7 @@ HRESULT WINAPI WsCopyNode( WS_XML_WRITER *handle, WS_XML_READER *reader, WS_ERRO ...@@ -4888,7 +4888,7 @@ HRESULT WINAPI WsCopyNode( WS_XML_WRITER *handle, WS_XML_READER *reader, WS_ERRO
done: done:
LeaveCriticalSection( &writer->cs ); LeaveCriticalSection( &writer->cs );
TRACE( "returning %08x\n", hr ); TRACE( "returning %#lx\n", hr );
return hr; return hr;
} }
......
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