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
Expand all 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/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/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/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;
} }
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