February 2022 - Wine-Devel - list.winehq.org

[PATCH 2/3] webservices: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker Feb. 15, 2022

Feb. 15, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/Makefile.in | 1 - dlls/webservices/channel.c | 70 +++++++++++++-------------- dlls/webservices/error.c | 14 +++--- dlls/webservices/heap.c | 12 ++--- dlls/webservices/listener.c | 22 ++++----- dlls/webservices/msg.c | 80 +++++++++++++++---------------- dlls/webservices/proxy.c | 18 +++---- dlls/webservices/reader.c | 84 ++++++++++++++++---------------- dlls/webservices/url.c | 12 ++--- dlls/webservices/writer.c | 92 ++++++++++++++++++------------------ 10 files changed, 202 insertions(+), 203 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index ac0600a5b9e..b58714d3253 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = webservices.dll IMPORTLIB = webservices IMPORTS = winhttp rpcrt4 user32 ws2_32 diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 9315334c23f..a9142bedee9 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -141,7 +141,7 @@ static void CALLBACK queue_runner( TP_CALLBACK_INSTANCE *instance, void *ctx ) return; default: - ERR( "wait failed %u\n", err ); + ERR( "wait failed %lu\n", err ); return; } } @@ -497,8 +497,8 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, { const WS_CHANNEL_PROPERTY *prop = &properties[i]; - TRACE( "property id %u value %p size %u\n", prop->id, prop->value, prop->valueSize ); - if (prop->valueSize == sizeof(ULONG) && prop->value) TRACE( " value %08x\n", *(ULONG *)prop->value ); + TRACE( "property id %u value %p size %lu\n", prop->id, prop->value, prop->valueSize ); + if (prop->valueSize == sizeof(ULONG) && prop->value) TRACE( " value %#lx\n", *(ULONG *)prop->value ); switch (prop->id) { @@ -559,7 +559,7 @@ HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding struct channel *channel; 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 (desc) FIXME( "ignoring security description\n" ); @@ -596,7 +596,7 @@ HRESULT WINAPI WsCreateChannelForListener( WS_LISTENER *listener_handle, const W WS_CHANNEL_BINDING binding; 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 (!listener_handle || !handle) return E_INVALIDARG; @@ -669,7 +669,7 @@ HRESULT WINAPI WsResetChannel( WS_CHANNEL *handle, WS_ERROR *error ) } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -682,7 +682,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID struct channel *channel = (struct channel *)handle; 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 (!channel) return E_INVALIDARG; @@ -717,7 +717,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -730,7 +730,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID struct channel *channel = (struct channel *)handle; 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 (!channel) return E_INVALIDARG; @@ -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 ); LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -838,7 +838,7 @@ static void shutdown_session_proc( struct task *task ) 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 ); TRACE( "%p returned\n", s->ctx.callback ); } @@ -888,7 +888,7 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -959,7 +959,7 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1196,7 +1196,7 @@ static void open_channel_proc( struct task *task ) 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 ); TRACE( "%p returned\n", o->ctx.callback ); } @@ -1252,7 +1252,7 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1362,7 +1362,7 @@ static enum session_mode map_channel_type( struct channel *channel ) { case WS_CHANNEL_TYPE_DUPLEX_SESSION: return SESSION_MODE_DUPLEX; default: - FIXME( "unhandled channel type %08x\n", channel->type ); + FIXME( "unhandled channel type %#x\n", channel->type ); return SESSION_MODE_INVALID; } } @@ -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 ); - 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 ); TRACE( "%p returned\n", s->ctx.callback ); } @@ -1746,7 +1746,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS struct async async; 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 (!channel || !msg || !desc) return E_INVALIDARG; @@ -1775,7 +1775,7 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1792,7 +1792,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS GUID id; 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 (!channel || !msg || !desc || !request) return E_INVALIDARG; @@ -1824,7 +1824,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS done: LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -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, 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 ); TRACE( "%p returned\n", r->ctx.callback ); } @@ -2402,7 +2402,7 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M struct async async; 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 ); if (error) FIXME( "ignoring error parameter\n" ); @@ -2426,7 +2426,7 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -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, 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 ); TRACE( "%p returned\n", r->ctx.callback ); } @@ -2515,7 +2515,7 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS struct async async; 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 ); if (error) FIXME( "ignoring error parameter\n" ); @@ -2546,7 +2546,7 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2573,7 +2573,7 @@ static void read_message_start_proc( struct task *task ) 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 ); TRACE( "%p returned\n", r->ctx.callback ); } @@ -2627,7 +2627,7 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2650,7 +2650,7 @@ static void read_message_end_proc( struct task *task ) 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 ); TRACE( "%p returned\n", r->ctx.callback ); } @@ -2698,7 +2698,7 @@ HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_A } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2725,7 +2725,7 @@ static void write_message_start_proc( struct task *task ) 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 ); TRACE( "%p returned\n", w->ctx.callback ); } @@ -2779,7 +2779,7 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2805,7 +2805,7 @@ static void write_message_end_proc( struct task *task ) 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 ); TRACE( "%p returned\n", w->ctx.callback ); } @@ -2859,7 +2859,7 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ } LeaveCriticalSection( &channel->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index d1a679b2ff6..d5364e42bff 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -81,7 +81,7 @@ HRESULT WINAPI WsCreateError( const WS_ERROR_PROPERTY *properties, ULONG count, HRESULT hr; ULONG i; - TRACE( "%p %u %p\n", properties, count, handle ); + TRACE( "%p %lu %p\n", properties, count, handle ); if (!handle) return E_INVALIDARG; if (!(error = alloc_error())) return E_OUTOFMEMORY; @@ -164,7 +164,7 @@ HRESULT WINAPI WsResetError( WS_ERROR *handle ) reset_error( error ); LeaveCriticalSection( &error->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -177,7 +177,7 @@ HRESULT WINAPI WsGetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, vo struct error *error = (struct error *)handle; 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; @@ -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 ); LeaveCriticalSection( &error->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -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 ) { - FIXME( "%p %u %p: stub\n", handle, index, str ); + FIXME( "%p %lu %p: stub\n", handle, index, str ); return E_NOTIMPL; } @@ -214,7 +214,7 @@ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, co struct error *error = (struct error *)handle; 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; @@ -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 ); LeaveCriticalSection( &error->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index a202b8308f0..93c57d523bd 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -166,7 +166,7 @@ HRESULT WINAPI WsAlloc( WS_HEAP *handle, SIZE_T size, void **ptr, WS_ERROR *erro { 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 (!handle || !ptr) return E_INVALIDARG; @@ -200,7 +200,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR { 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 (!handle || count) return E_INVALIDARG; @@ -274,7 +274,7 @@ HRESULT WINAPI WsResetHeap( WS_HEAP *handle, WS_ERROR *error ) reset_heap( heap ); LeaveCriticalSection( &heap->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -287,7 +287,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void struct heap *heap = (struct heap *)handle; 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 (!heap) return E_INVALIDARG; @@ -315,7 +315,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void } LeaveCriticalSection( &heap->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -357,7 +357,7 @@ HRESULT WINAPI WsCreateXmlBuffer( WS_HEAP *heap, const WS_XML_BUFFER_PROPERTY *p { 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 (!heap || !handle) return E_INVALIDARG; diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 01b739084ed..6b9dca05486 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -234,7 +234,7 @@ HRESULT WINAPI WsCreateListener( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING bindin struct listener *listener; 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 (desc) FIXME( "ignoring security description\n" ); @@ -471,7 +471,7 @@ HRESULT WINAPI WsOpenListener( WS_LISTENER *handle, WS_STRING *url, const WS_ASY else hr = open_listener( listener, url ); LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -506,7 +506,7 @@ HRESULT WINAPI WsCloseListener( WS_LISTENER *handle, const WS_ASYNC_CONTEXT *ctx close_listener( listener ); LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -537,7 +537,7 @@ HRESULT WINAPI WsResetListener( WS_LISTENER *handle, WS_ERROR *error ) reset_listener( listener ); LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -550,7 +550,7 @@ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ struct listener *listener = (struct listener *)handle; 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 (!listener) return E_INVALIDARG; @@ -585,7 +585,7 @@ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ } LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -598,7 +598,7 @@ HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ struct listener *listener = (struct listener *)handle; 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 (!listener) return E_INVALIDARG; @@ -614,7 +614,7 @@ HRESULT WINAPI WsSetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ hr = prop_set( listener->prop, listener->prop_count, id, value, size ); LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -660,7 +660,7 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, LeaveCriticalSection( &listener->cs ); hr = channel_accept_tcp( socket, wait, cancel, channel_handle ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } case WS_UDP_CHANNEL_BINDING: @@ -669,7 +669,7 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, LeaveCriticalSection( &listener->cs ); hr = channel_accept_udp( socket, wait, cancel, channel_handle ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } default: @@ -679,6 +679,6 @@ HRESULT WINAPI WsAcceptChannel( WS_LISTENER *handle, WS_CHANNEL *channel_handle, } LeaveCriticalSection( &listener->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index bd585b176fc..092e9aabc5d 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -216,7 +216,7 @@ HRESULT WINAPI WsCreateMessage( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_V { 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 (!handle || !env_version || !addr_version || @@ -240,7 +240,7 @@ HRESULT WINAPI WsCreateMessageForChannel( WS_CHANNEL *channel_handle, const WS_M WS_ADDRESSING_VERSION version_addr; 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 (!channel_handle || !handle) return E_INVALIDARG; @@ -307,7 +307,7 @@ HRESULT WINAPI WsResetMessage( WS_MESSAGE *handle, WS_ERROR *error ) reset_msg( msg ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -320,7 +320,7 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID struct msg *msg = (struct msg *)handle; 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 (!msg) return E_INVALIDARG; @@ -380,7 +380,7 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -393,7 +393,7 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID struct msg *msg = (struct msg *)handle; 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 (!msg) return E_INVALIDARG; @@ -421,7 +421,7 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -464,7 +464,7 @@ HRESULT WINAPI WsAddressMessage( WS_MESSAGE *handle, const WS_ENDPOINT_ADDRESS * if (hr == S_OK) msg->is_addressed = TRUE; LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -760,7 +760,7 @@ HRESULT WINAPI WsWriteEnvelopeStart( WS_MESSAGE *handle, WS_XML_WRITER *writer, } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -790,7 +790,7 @@ HRESULT WINAPI WsWriteEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) msg->state = WS_MESSAGE_STATE_DONE; LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -803,7 +803,7 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de struct msg *msg = (struct msg *)handle; 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 (!msg || !desc) return E_INVALIDARG; @@ -833,7 +833,7 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de done: LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -845,7 +845,7 @@ HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTE struct msg *msg = (struct msg *)handle; 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; @@ -860,7 +860,7 @@ HRESULT WINAPI WsFlushBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTE hr = WsFlushWriter( msg->writer_body, size, ctx, error ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -967,7 +967,7 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -997,7 +997,7 @@ HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) msg->state = WS_MESSAGE_STATE_DONE; LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1010,7 +1010,7 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des struct msg *msg = (struct msg *)handle; 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 (!msg || !desc) return E_INVALIDARG; @@ -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 ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1039,7 +1039,7 @@ HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEX struct msg *msg = (struct msg *)handle; 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; @@ -1054,7 +1054,7 @@ HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEX hr = WsFillReader( msg->reader_body, size, ctx, error ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1093,7 +1093,7 @@ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATIO } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1194,7 +1194,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val HRESULT hr; 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 (!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 done: LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1288,7 +1288,7 @@ HRESULT WINAPI WsGetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val struct msg *msg = (struct msg *)handle; 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 (!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 else hr = get_standard_header( msg, type, value_type, option, heap, value, size ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1357,7 +1357,7 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1490,7 +1490,7 @@ HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, struct msg *msg = (struct msg *)handle; 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 (!msg || !name) return E_INVALIDARG; @@ -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 ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1548,7 +1548,7 @@ HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *na } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1636,7 +1636,7 @@ HRESULT WINAPI WsGetMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, struct msg *msg = (struct msg *)handle; 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 ); if (error) FIXME( "ignoring error parameter\n" ); if (option != WS_SINGLETON_HEADER) @@ -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 ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1707,7 +1707,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI struct header *header; 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 (!msg || !desc) return E_INVALIDARG; @@ -1734,7 +1734,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI done: LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1761,7 +1761,7 @@ HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI struct msg *msg = (struct msg *)handle; 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 ); if (error) FIXME( "ignoring error parameter\n" ); @@ -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 ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1837,7 +1837,7 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na } LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1993,7 +1993,7 @@ HRESULT message_insert_http_headers( WS_MESSAGE *handle, HINTERNET req ) done: free( header ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2051,7 +2051,7 @@ HRESULT message_map_http_response_headers( WS_MESSAGE *handle, HINTERNET req, co hr = map_http_response_headers( msg, req, mapping ); LeaveCriticalSection( &msg->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2108,7 +2108,7 @@ void message_do_send_callback( WS_MESSAGE *handle ) HRESULT hr; TRACE( "executing callback %p\n", msg->ctx_send.callback ); 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 ); @@ -2131,7 +2131,7 @@ void message_do_receive_callback( WS_MESSAGE *handle ) HRESULT hr; TRACE( "executing callback %p\n", msg->ctx_receive.callback ); 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 ); diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 80e5965ce3e..09f6e2bee00 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -125,7 +125,7 @@ HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNE WS_CHANNEL *channel; 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 ); if (error) FIXME( "ignoring error parameter\n" ); if (desc) FIXME( "ignoring security description\n" ); @@ -160,7 +160,7 @@ HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, WS_CHANNEL *channel; 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 ); if (error) FIXME( "ignoring error parameter\n" ); @@ -236,7 +236,7 @@ HRESULT WINAPI WsResetServiceProxy( WS_SERVICE_PROXY *handle, WS_ERROR *error ) reset_proxy( proxy ); LeaveCriticalSection( &proxy->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -274,7 +274,7 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO struct proxy *proxy = (struct proxy *)handle; 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 (!proxy) return E_INVALIDARG; @@ -299,7 +299,7 @@ HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PRO } LeaveCriticalSection( &proxy->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -330,7 +330,7 @@ HRESULT WINAPI WsOpenServiceProxy( WS_SERVICE_PROXY *handle, const WS_ENDPOINT_A proxy->state = WS_SERVICE_PROXY_STATE_OPEN; LeaveCriticalSection( &proxy->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -360,7 +360,7 @@ HRESULT WINAPI WsCloseServiceProxy( WS_SERVICE_PROXY *handle, const WS_ASYNC_CON proxy->state = WS_SERVICE_PROXY_STATE_CLOSED; LeaveCriticalSection( &proxy->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -505,7 +505,7 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION HRESULT hr; 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 (ctx) FIXME( "ignoring ctx parameter\n" ); for (i = 0; i < count; i++) @@ -542,6 +542,6 @@ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION done: WsFreeMessage( msg ); LeaveCriticalSection( &proxy->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index d01222bd518..7da0c8335ea 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -561,7 +561,7 @@ HRESULT WINAPI WsCreateReader( const WS_XML_READER_PROPERTY *properties, ULONG c BOOL read_decl = TRUE; 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 (!handle) return E_INVALIDARG; @@ -651,7 +651,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY struct reader *reader = (struct reader *)handle; 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 (ctx) FIXME( "ignoring ctx parameter\n" ); @@ -677,7 +677,7 @@ HRESULT WINAPI WsFillReader( WS_XML_READER *handle, ULONG min_size, const WS_ASY } LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -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; } @@ -783,7 +783,7 @@ HRESULT WINAPI WsGetReaderNode( WS_XML_READER *handle, const WS_XML_NODE **node, *node = &reader->current->hdr.node; LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return S_OK; } @@ -804,7 +804,7 @@ HRESULT WINAPI WsGetReaderProperty( WS_XML_READER *handle, WS_XML_READER_PROPERT struct reader *reader = (struct reader *)handle; 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 (!reader) return E_INVALIDARG; @@ -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 ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3161,7 +3161,7 @@ HRESULT WINAPI WsReadEndElement( WS_XML_READER *handle, WS_ERROR *error ) hr = read_endelement( reader ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3189,7 +3189,7 @@ HRESULT WINAPI WsReadNode( WS_XML_READER *handle, WS_ERROR *error ) hr = read_node( reader ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3236,7 +3236,7 @@ HRESULT WINAPI WsSkipNode( WS_XML_READER *handle, WS_ERROR *error ) hr = skip_node( reader ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3264,7 +3264,7 @@ HRESULT WINAPI WsReadStartElement( WS_XML_READER *handle, WS_ERROR *error ) hr = read_startelement( reader ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3294,7 +3294,7 @@ HRESULT WINAPI WsReadToStartElement( WS_XML_READER *handle, const WS_XML_STRING hr = read_to_startelement( reader, found ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -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 ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3608,7 +3608,7 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO const WS_XML_ELEMENT_NODE *elem; 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 (!reader) return E_INVALIDARG; @@ -3630,7 +3630,7 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO } LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return S_OK; } @@ -3659,7 +3659,7 @@ HRESULT WINAPI WsReadEndAttribute( WS_XML_READER *handle, WS_ERROR *error ) else reader->state = READER_STATE_STARTELEMENT; LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -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 ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4283,7 +4283,7 @@ HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *loca } LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -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)) { - 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 ); ws_free( heap, buf, nb_allocated * item_size ); return WS_E_INVALID_FORMAT; @@ -6341,7 +6341,7 @@ static HRESULT read_type_field( struct reader *reader, const WS_STRUCT_DESCRIPTI if (!desc) return E_INVALIDARG; 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; } 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, if (!desc) return E_INVALIDARG; 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 ); } @@ -6716,7 +6716,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY BOOL found; 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 ); if (error) FIXME( "ignoring error parameter\n" ); @@ -6745,7 +6745,7 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY } LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -6783,7 +6783,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO BOOL found; 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 (!reader || !desc || !value) return E_INVALIDARG; @@ -6800,7 +6800,7 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO desc->elementNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -6815,7 +6815,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi BOOL found; 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 (!reader || !value || type == ~0u) return E_INVALIDARG; @@ -6832,7 +6832,7 @@ HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, voi NULL, value, size, &found ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -6847,7 +6847,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI BOOL found; 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 (!reader || !desc || !value) return E_INVALIDARG; @@ -6865,7 +6865,7 @@ HRESULT WINAPI WsReadAttribute( WS_XML_READER *handle, const WS_ATTRIBUTE_DESCRI desc->attributeNs, desc->typeDescription, option, heap, value, size, &found ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -6968,7 +6968,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * ULONG i, offset = 0; 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 (!reader) return E_INVALIDARG; @@ -7051,7 +7051,7 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * done: LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7099,7 +7099,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, HRESULT hr; 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 (!reader || !xmlbuf) return E_INVALIDARG; @@ -7127,7 +7127,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, done: LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7160,7 +7160,7 @@ HRESULT WINAPI WsGetReaderPosition( WS_XML_READER *handle, WS_XML_NODE_POSITION } LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7189,7 +7189,7 @@ HRESULT WINAPI WsSetReaderPosition( WS_XML_READER *handle, const WS_XML_NODE_POS else reader->current = pos->node; LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7209,7 +7209,7 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, struct reader *reader = (struct reader *)handle; 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 (!reader) return E_INVALIDARG; @@ -7254,7 +7254,7 @@ HRESULT WINAPI WsReadBytes( WS_XML_READER *handle, void *bytes, ULONG max_count, done: LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7275,7 +7275,7 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count struct reader *reader = (struct reader *)handle; 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 (!reader) return E_INVALIDARG; @@ -7321,7 +7321,7 @@ HRESULT WINAPI WsReadChars( WS_XML_READER *handle, WCHAR *chars, ULONG max_count done: LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7333,7 +7333,7 @@ HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_co struct reader *reader = (struct reader *)handle; 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 (!reader) return E_INVALIDARG; @@ -7375,7 +7375,7 @@ HRESULT WINAPI WsReadCharsUtf8( WS_XML_READER *handle, BYTE *bytes, ULONG max_co done: LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -7443,7 +7443,7 @@ done: if (hr != S_OK) free_xmlbuf( (struct xmlbuf *)buffer ); WsFreeWriter( writer ); LeaveCriticalSection( &reader->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 7585abadee8..c2db435e3d7 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -176,14 +176,14 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS WS_HTTP_URL *url = NULL; 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 (!str || !heap) return E_INVALIDARG; if (!str->length) return WS_E_INVALID_FORMAT; if (flags) { - FIXME( "unimplemented flags %08x\n", flags ); + FIXME( "unimplemented flags %#lx\n", flags ); return E_NOTIMPL; } if (!(decoded = url_decode( str->chars, str->length, heap, &len_decoded )) || @@ -269,7 +269,7 @@ done: if (decoded != str->chars) ws_free( heap, decoded, len_decoded ); ws_free( heap, url, sizeof(*url) ); } - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -433,13 +433,13 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S ULONG port = 0; 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 (!url || !heap || !ret) return E_INVALIDARG; if (flags) { - FIXME( "unimplemented flags %08x\n", flags ); + FIXME( "unimplemented flags %#lx\n", flags ); return E_NOTIMPL; } 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 done: if (hr != S_OK) ws_free( heap, str, ret_size ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 1dacc10ec43..cd40b8ad8f6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -195,7 +195,7 @@ HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG c WS_CHARSET charset = WS_CHARSET_UTF8; 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 (!handle) return E_INVALIDARG; @@ -273,7 +273,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT struct writer *writer = (struct writer *)handle; 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 (!writer) return E_INVALIDARG; @@ -321,7 +321,7 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -359,7 +359,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING HRESULT hr; 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 (!writer) return E_INVALIDARG; @@ -450,7 +450,7 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -467,7 +467,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer HRESULT hr; 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 (!writer || !xmlbuf) return E_INVALIDARG; @@ -498,7 +498,7 @@ HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -525,7 +525,7 @@ HRESULT WINAPI WsFlushWriter( WS_XML_WRITER *handle, ULONG min_size, const WS_AS struct writer *writer = (struct writer *)handle; 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 (ctx) FIXME( "ignoring ctx parameter\n" ); @@ -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 ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1536,7 +1536,7 @@ HRESULT WINAPI WsGetPrefixFromNamespace( WS_XML_WRITER *handle, const WS_XML_STR } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1733,7 +1733,7 @@ HRESULT WINAPI WsWriteEndAttribute( WS_XML_WRITER *handle, WS_ERROR *error ) writer->state = WRITER_STATE_STARTELEMENT; LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -1976,7 +1976,7 @@ HRESULT WINAPI WsWriteEndElement( WS_XML_WRITER *handle, WS_ERROR *error ) hr = write_endelement_node( writer ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2032,7 +2032,7 @@ HRESULT WINAPI WsWriteEndStartElement( WS_XML_WRITER *handle, WS_ERROR *error ) done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2101,7 +2101,7 @@ HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING writer->state = WRITER_STATE_STARTATTRIBUTE; LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2180,7 +2180,7 @@ HRESULT WINAPI WsWriteStartCData( WS_XML_WRITER *handle, WS_ERROR *error ) hr = write_cdata_node( writer ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2226,7 +2226,7 @@ HRESULT WINAPI WsWriteEndCData( WS_XML_WRITER *handle, WS_ERROR *error ) else hr = write_endcdata_node( writer ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2313,7 +2313,7 @@ HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING * hr = write_element_node( writer, prefix, localname, ns ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -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 ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -2982,7 +2982,7 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou WS_XML_BASE64_TEXT base64; 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 (!writer) return E_INVALIDARG; @@ -3007,7 +3007,7 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3020,7 +3020,7 @@ HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG co WS_XML_UTF16_TEXT utf16; 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 (!writer) return E_INVALIDARG; @@ -3045,7 +3045,7 @@ HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG co } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -3058,7 +3058,7 @@ HRESULT WINAPI WsWriteCharsUtf8( WS_XML_WRITER *handle, const BYTE *bytes, ULONG WS_XML_UTF8_TEXT utf8; 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 (!writer) return E_INVALIDARG; @@ -3083,7 +3083,7 @@ HRESULT WINAPI WsWriteCharsUtf8( WS_XML_WRITER *handle, const BYTE *bytes, ULONG } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -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)) { - FIXME( "options 0x%x not supported\n", desc->options ); + FIXME( "options %#lx not supported\n", desc->options ); return E_NOTIMPL; } @@ -3883,7 +3883,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping HRESULT hr; 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 (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 struct writer *writer = (struct writer *)handle; 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 (!writer || !desc || !desc->attributeLocalName || !desc->attributeNs || !value) @@ -4044,7 +4044,7 @@ HRESULT WINAPI WsWriteAttribute( WS_XML_WRITER *handle, const WS_ATTRIBUTE_DESCR } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4058,7 +4058,7 @@ HRESULT WINAPI WsWriteElement( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTI struct writer *writer = (struct writer *)handle; 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 (!writer || !desc || !desc->elementLocalName || !desc->elementNs || !value) @@ -4081,7 +4081,7 @@ HRESULT WINAPI WsWriteElement( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTI done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4095,7 +4095,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T struct writer *writer = (struct writer *)handle; 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 ); if (error) FIXME( "ignoring error parameter\n" ); @@ -4128,7 +4128,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4168,7 +4168,7 @@ HRESULT WINAPI WsWriteValue( WS_XML_WRITER *handle, WS_VALUE_TYPE value_type, co HRESULT hr = S_OK; 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 (!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 if (hr == S_OK) hr = write_type( writer, mapping, type, NULL, WS_WRITE_REQUIRED_VALUE, value, size ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4214,7 +4214,7 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna ULONG type_size, i; 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 ); if (error) FIXME( "ignoring error parameter\n" ); @@ -4258,7 +4258,7 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4297,7 +4297,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4315,7 +4315,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu char *buf; 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 ); if (error) FIXME( "ignoring error parameter\n" ); @@ -4352,7 +4352,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4384,7 +4384,7 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING hr = add_namespace_attribute( writer, prefix, ns, single ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4435,7 +4435,7 @@ HRESULT WINAPI WsWriteQualifiedName( WS_XML_WRITER *handle, const WS_XML_STRING else hr = write_qualified_name( writer, prefix, localname, ns ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -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 ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4568,7 +4568,7 @@ HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION } LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4597,7 +4597,7 @@ HRESULT WINAPI WsSetWriterPosition( WS_XML_WRITER *handle, const WS_XML_NODE_POS else writer->current = pos->node; LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4757,7 +4757,7 @@ HRESULT WINAPI WsWriteNode( WS_XML_WRITER *handle, const WS_XML_NODE *node, WS_E else hr = write_node( writer, node ); LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } @@ -4888,7 +4888,7 @@ HRESULT WINAPI WsCopyNode( WS_XML_WRITER *handle, WS_XML_READER *reader, WS_ERRO done: LeaveCriticalSection( &writer->cs ); - TRACE( "returning %08x\n", hr ); + TRACE( "returning %#lx\n", hr ); return hr; } -- 2.30.2

1 0

[PATCH 1/3] wldap32: Build without -DWINE_NO_LONG_TYPES.
by Hans Leidekker Feb. 15, 2022

Feb. 15, 2022

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wldap32/Makefile.in | 1 - dlls/wldap32/bind.c | 10 +++---- dlls/wldap32/dn.c | 4 +-- dlls/wldap32/error.c | 8 +++--- dlls/wldap32/extended.c | 2 +- dlls/wldap32/init.c | 20 +++++++------- dlls/wldap32/main.c | 2 +- dlls/wldap32/misc.c | 8 +++--- dlls/wldap32/option.c | 2 +- dlls/wldap32/page.c | 15 +++++----- dlls/wldap32/search.c | 20 +++++++------- dlls/wldap32/tests/Makefile.in | 1 - dlls/wldap32/tests/ber.c | 2 +- dlls/wldap32/tests/parse.c | 50 +++++++++++++++++----------------- 14 files changed, 72 insertions(+), 73 deletions(-) diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index ba60d525ac6..088b1c3abf5 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wldap32.dll UNIXLIB = wldap32.so IMPORTLIB = wldap32 diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 9dc9b29bac4..160a3d1ed30 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -41,7 +41,7 @@ ULONG CDECL ldap_bindA( LDAP *ld, char *dn, char *cred, ULONG method ) ULONG ret = LDAP_NO_MEMORY; WCHAR *dnW = NULL, *credW = NULL; - TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_a(dn), cred, method ); + TRACE( "(%p, %s, %p, %#lx)\n", ld, debugstr_a(dn), cred, method ); if (!ld) return ~0u; @@ -81,7 +81,7 @@ ULONG CDECL ldap_bindW( LDAP *ld, WCHAR *dn, WCHAR *cred, ULONG method ) struct bervalU pwd = { 0, NULL }; int msg; - TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method ); + TRACE( "(%p, %s, %p, %#lx)\n", ld, debugstr_w(dn), cred, method ); if (!ld) return ~0u; if (method != LDAP_AUTH_SIMPLE) return LDAP_PARAM_ERROR; @@ -119,7 +119,7 @@ ULONG CDECL ldap_bind_sA( LDAP *ld, char *dn, char *cred, ULONG method ) ULONG ret = LDAP_NO_MEMORY; WCHAR *dnW = NULL, *credW = NULL; - TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_a(dn), cred, method ); + TRACE( "(%p, %s, %p, %#lx)\n", ld, debugstr_a(dn), cred, method ); if (!ld) return LDAP_PARAM_ERROR; @@ -162,7 +162,7 @@ ULONG CDECL ldap_bind_sW( LDAP *ld, WCHAR *dn, WCHAR *cred, ULONG method ) char *dnU = NULL, *credU = NULL; struct bervalU pwd = { 0, NULL }; - TRACE( "(%p, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), cred, method ); + TRACE( "(%p, %s, %p, %#lx)\n", ld, debugstr_w(dn), cred, method ); if (!ld) return LDAP_PARAM_ERROR; @@ -224,7 +224,7 @@ ULONG CDECL ldap_bind_sW( LDAP *ld, WCHAR *dn, WCHAR *cred, ULONG method ) } else { - FIXME( "method %#x not supported\n", method ); + FIXME( "method %#lx not supported\n", method ); return LDAP_PARAM_ERROR; } diff --git a/dlls/wldap32/dn.c b/dlls/wldap32/dn.c index 40e62fafa1e..d18ff88d9aa 100644 --- a/dlls/wldap32/dn.c +++ b/dlls/wldap32/dn.c @@ -96,7 +96,7 @@ char ** CDECL ldap_explode_dnA( char *dn, ULONG notypes ) char **ret; WCHAR *dnW, **retW; - TRACE( "(%s, 0x%08x)\n", debugstr_a(dn), notypes ); + TRACE( "(%s, %#lx)\n", debugstr_a(dn), notypes ); if (!(dnW = strAtoW( dn ))) return NULL; @@ -130,7 +130,7 @@ WCHAR ** CDECL ldap_explode_dnW( WCHAR *dn, ULONG notypes ) WCHAR **ret = NULL; char *dnU, **retU; - TRACE( "(%s, 0x%08x)\n", debugstr_w(dn), notypes ); + TRACE( "(%s, %#lx)\n", debugstr_w(dn), notypes ); if ((dnU = strWtoU( dn ))) { diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index 8b6881bdc90..a72babf830d 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -67,7 +67,7 @@ char * CDECL ldap_err2stringA( ULONG err ) { static char buf[256] = ""; - TRACE( "(0x%08x)\n", err ); + TRACE( "(%#lx)\n", err ); if (err <= LDAP_REFERRAL_LIMIT_EXCEEDED) LoadStringA( hwldap32, err, buf, 256 ); @@ -97,7 +97,7 @@ WCHAR * CDECL ldap_err2stringW( ULONG err ) { static WCHAR buf[256] = { 0 }; - TRACE( "(0x%08x)\n", err ); + TRACE( "(%#lx)\n", err ); if (err <= LDAP_REFERRAL_LIMIT_EXCEEDED) LoadStringW( hwldap32, err, buf, 256 ); @@ -148,7 +148,7 @@ ULONG CDECL ldap_result2error( LDAP *ld, LDAPMessage *res, ULONG free ) { int error; - TRACE( "(%p, %p, 0x%08x)\n", ld, res, free ); + TRACE( "(%p, %p, %#lx)\n", ld, res, free ); if (ld && res) { @@ -289,7 +289,7 @@ static const ULONG errormap[] = { */ ULONG CDECL LdapMapErrorToWin32( ULONG err ) { - TRACE( "(0x%08x)\n", err ); + TRACE( "(%#lx)\n", err ); if (err >= ARRAY_SIZE( errormap )) return ERROR_DS_GENERIC_ERROR; return errormap[err]; diff --git a/dlls/wldap32/extended.c b/dlls/wldap32/extended.c index 85e000f52c1..e693ae034f1 100644 --- a/dlls/wldap32/extended.c +++ b/dlls/wldap32/extended.c @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); */ ULONG CDECL ldap_close_extended_op( LDAP *ld, ULONG msgid ) { - TRACE( "(%p, 0x%08x)\n", ld, msgid ); + TRACE( "(%p, %#lx)\n", ld, msgid ); if (!ld) return LDAP_PARAM_ERROR; return LDAP_SUCCESS; diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index e62fd2fe794..bd9c8cb4277 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -118,10 +118,10 @@ static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnum { char *res, *p, *q, **v; unsigned int i = 0, size = 0; - static const char sep[] = " ", fmt[] = ":%d"; + static const char sep[] = " "; char port[7]; - sprintf( port, fmt, portnumber ); + sprintf( port, ":%lu", portnumber ); for (v = hostnames; *v; v++) { @@ -220,7 +220,7 @@ LDAP * CDECL cldap_openA( char *hostname, ULONG portnumber ) LDAP *ld; WCHAR *hostnameW = NULL; - TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_a(hostname), portnumber ); if (hostname && !(hostnameW = strAtoW( hostname ))) return NULL; @@ -256,7 +256,7 @@ LDAP * CDECL cldap_openW( WCHAR *hostname, ULONG portnumber ) LDAP *ld = NULL; char *hostnameU, *url = NULL; - TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_w(hostname), portnumber ); if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "cldap://", hostnameU, portnumber ))) goto exit; @@ -305,7 +305,7 @@ LDAP * CDECL ldap_initA( const PCHAR hostname, ULONG portnumber ) LDAP *ld; WCHAR *hostnameW = NULL; - TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_a(hostname), portnumber ); if (hostname && !(hostnameW = strAtoW( hostname ))) return NULL; @@ -342,7 +342,7 @@ LDAP * CDECL ldap_initW( const PWCHAR hostname, ULONG portnumber ) LDAP *ld = NULL; char *hostnameU, *url = NULL; - TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_w(hostname), portnumber ); if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; @@ -365,7 +365,7 @@ LDAP * CDECL ldap_openA( char *hostname, ULONG portnumber ) LDAP *ld; WCHAR *hostnameW = NULL; - TRACE( "(%s, %d)\n", debugstr_a(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_a(hostname), portnumber ); if (hostname && !(hostnameW = strAtoW( hostname ))) return NULL; @@ -401,7 +401,7 @@ LDAP * CDECL ldap_openW( WCHAR *hostname, ULONG portnumber ) LDAP *ld = NULL; char *hostnameU, *url = NULL; - TRACE( "(%s, %d)\n", debugstr_w(hostname), portnumber ); + TRACE( "(%s, %lu)\n", debugstr_w(hostname), portnumber ); if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; if (!(url = urlify_hostnames( "ldap://", hostnameU, portnumber ))) goto exit; @@ -424,7 +424,7 @@ LDAP * CDECL ldap_sslinitA( char *hostname, ULONG portnumber, int secure ) LDAP *ld; WCHAR *hostnameW = NULL; - TRACE( "(%s, %d, 0x%08x)\n", debugstr_a(hostname), portnumber, secure ); + TRACE( "(%s, %lu, %d)\n", debugstr_a(hostname), portnumber, secure ); if (hostname && !(hostnameW = strAtoW( hostname ))) return NULL; @@ -462,7 +462,7 @@ LDAP * CDECL ldap_sslinitW( WCHAR *hostname, ULONG portnumber, int secure ) LDAP *ld = NULL; char *hostnameU, *url = NULL; - TRACE( "(%s, %d, 0x%08x)\n", debugstr_w(hostname), portnumber, secure ); + TRACE( "(%s, %lu, %d)\n", debugstr_w(hostname), portnumber, secure ); if (!(hostnameU = strWtoU( hostname ? hostname : L"localhost" ))) return NULL; diff --git a/dlls/wldap32/main.c b/dlls/wldap32/main.c index 375730ddeca..2fffb11f064 100644 --- a/dlls/wldap32/main.c +++ b/dlls/wldap32/main.c @@ -34,7 +34,7 @@ unixlib_handle_t ldap_handle = 0; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { - TRACE( "(%p, %d, %p)\n", hinst, reason, reserved ); + TRACE( "(%p, %#lx, %p)\n", hinst, reason, reserved ); switch (reason) { diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index c3821056693..697f1d3ad5e 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); */ ULONG CDECL ldap_abandon( LDAP *ld, ULONG msgid ) { - TRACE( "(%p, 0x%08x)\n", ld, msgid ); + TRACE( "(%p, %#lx)\n", ld, msgid ); if (!ld) return ~0u; else @@ -223,7 +223,7 @@ ULONG CDECL ldap_escape_filter_elementA( char *src, ULONG srclen, char *dst, ULO { ULONG len = get_escape_size( src, srclen ); - TRACE( "(%p, 0x%08x, %p, 0x%08x)\n", src, srclen, dst, dstlen ); + TRACE( "(%p, %#lx, %p, %#lx)\n", src, srclen, dst, dstlen ); if (!dst) return len; if (!src || dstlen < len) return LDAP_PARAM_ERROR; @@ -251,7 +251,7 @@ ULONG CDECL ldap_escape_filter_elementW( char *src, ULONG srclen, WCHAR *dst, UL { ULONG len = get_escape_size( src, srclen ); - TRACE( "(%p, 0x%08x, %p, 0x%08x)\n", src, srclen, dst, dstlen ); + TRACE( "(%p, %#lx, %p, %#lx)\n", src, srclen, dst, dstlen ); if (!dst) return len; @@ -629,7 +629,7 @@ ULONG CDECL ldap_result( LDAP *ld, ULONG msgid, ULONG all, struct l_timeval *tim void *msgU = NULL; ULONG ret = ~0u; - TRACE( "(%p, 0x%08x, 0x%08x, %p, %p)\n", ld, msgid, all, timeout, res ); + TRACE( "(%p, %#lx, %#lx, %p, %p)\n", ld, msgid, all, timeout, res ); if (ld && res && msgid != ~0u) { diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index d68c3a9981c..efd0d4586b9 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -395,7 +395,7 @@ static BOOL query_supported_server_ctrls( LDAP *ld ) struct ldap_get_values_len_params get_params = { CTX(ld), entry, attrs[0], &ctrls }; LDAP_CALL( ldap_get_values_len, &get_params ); count = LDAP_CALL( ldap_count_values_len, ctrls ); - for (i = 0; i < count; i++) TRACE("%u: %s\n", i, debugstr_an( ctrls[i]->bv_val, ctrls[i]->bv_len )); + for (i = 0; i < count; i++) TRACE( "%lu: %s\n", i, debugstr_an( ctrls[i]->bv_val, ctrls[i]->bv_len ) ); *(struct bervalU ***)&SERVER_CTRLS(ld) = ctrls; } } diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 9f4acbdaa16..e36d0ad5615 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -45,7 +45,7 @@ ULONG CDECL ldap_create_page_controlA( LDAP *ld, ULONG pagesize, struct berval * ULONG ret; LDAPControlW *controlW = NULL; - TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); + TRACE( "(%p, %#lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); if (!ld || !control || pagesize > INT_MAX) return LDAP_PARAM_ERROR; @@ -129,7 +129,7 @@ static ULONG create_page_control( ULONG pagesize, struct berval *cookie, UCHAR c ULONG CDECL ldap_create_page_controlW( LDAP *ld, ULONG pagesize, struct berval *cookie, UCHAR critical, LDAPControlW **control ) { - TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); + TRACE( "(%p, %#lx, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); if (!ld || !control || pagesize > INT_MAX) return LDAP_PARAM_ERROR; return create_page_control( pagesize, cookie, critical, control ); @@ -137,7 +137,7 @@ ULONG CDECL ldap_create_page_controlW( LDAP *ld, ULONG pagesize, struct berval * ULONG CDECL ldap_get_next_page( LDAP *ld, LDAPSearch *search, ULONG pagesize, ULONG *message ) { - FIXME( "(%p, %p, 0x%08x, %p)\n", ld, search, pagesize, message ); + FIXME( "(%p, %p, %#lx, %p)\n", ld, search, pagesize, message ); if (!ld) return ~0u; return LDAP_NOT_SUPPORTED; @@ -148,7 +148,7 @@ ULONG CDECL ldap_get_next_page_s( LDAP *ld, LDAPSearch *search, struct l_timeval { ULONG ret; - TRACE( "(%p, %p, %p, %u, %p, %p)\n", ld, search, timeout, pagesize, count, results ); + TRACE( "(%p, %p, %p, %lu, %p, %p)\n", ld, search, timeout, pagesize, count, results ); if (!ld || !search || !count || !results) return ~0u; @@ -203,7 +203,8 @@ ULONG CDECL ldap_get_paged_count( LDAP *ld, LDAPSearch *search, ULONG *count, LD ret = ldap_parse_page_controlW( ld, server_ctrls, count, &search->cookie ); if (ret == LDAP_SUCCESS) - TRACE("new search->cookie: %s, count %u\n", debugstr_an(search->cookie->bv_val, search->cookie->bv_len), *count); + TRACE( "new search->cookie: %s, count %lu\n", + debugstr_an(search->cookie->bv_val, search->cookie->bv_len), *count ); ldap_controls_freeW( server_ctrls ); return ret; @@ -292,7 +293,7 @@ LDAPSearch * CDECL ldap_search_init_pageA( LDAP *ld, char *dn, ULONG scope, char ULONG attrsonly, LDAPControlA **serverctrls, LDAPControlA **clientctrls, ULONG timelimit, ULONG sizelimit, LDAPSortKeyA **sortkeys ) { - FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", ld, debugstr_a(dn), scope, + FIXME( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %#lx, %#lx, %p)\n", ld, debugstr_a(dn), scope, debugstr_a(filter), attrs, attrsonly, serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); return NULL; } @@ -304,7 +305,7 @@ LDAPSearch * CDECL ldap_search_init_pageW( LDAP *ld, WCHAR *dn, ULONG scope, WCH LDAPSearch *search; DWORD i, len; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", ld, debugstr_w(dn), scope, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %#lx, %#lx, %p)\n", ld, debugstr_w(dn), scope, debugstr_w(filter), attrs, attrsonly, serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); if (!(search = calloc( 1, sizeof(*search) ))) diff --git a/dlls/wldap32/search.c b/dlls/wldap32/search.c index b360ab5366c..a673851b148 100644 --- a/dlls/wldap32/search.c +++ b/dlls/wldap32/search.c @@ -40,7 +40,7 @@ ULONG CDECL ldap_searchA( LDAP *ld, char *base, ULONG scope, char *filter, char ULONG ret = LDAP_NO_MEMORY; WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly ); + TRACE( "(%p, %s, %#lx, %s, %p, %#lx)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly ); if (!ld) return ~0u; @@ -83,7 +83,7 @@ exit: ULONG CDECL ldap_searchW( LDAP *ld, WCHAR *base, ULONG scope, WCHAR *filter, WCHAR **attrs, ULONG attrsonly ) { ULONG ret, msg; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly ); + TRACE( "(%p, %s, %#lx, %s, %p, %#lx)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly ); ret = ldap_search_extW( ld, base, scope, filter, attrs, attrsonly, NULL, NULL, 0, 0, &msg ); if (ret == LDAP_SUCCESS) return msg; @@ -102,7 +102,7 @@ ULONG CDECL ldap_search_extA( LDAP *ld, char *base, ULONG scope, char *filter, c WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL; LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", ld, debugstr_a(base), scope, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %#lx, %#lx, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly, serverctrls, clientctrls, timelimit, sizelimit, message ); if (!ld) return LDAP_PARAM_ERROR; @@ -162,7 +162,7 @@ ULONG CDECL ldap_search_extW( LDAP *ld, WCHAR *base, ULONG scope, WCHAR *filter, LDAPControlU **serverctrlsU = NULL, **clientctrlsU = NULL; struct timevalU timevalU; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", ld, debugstr_w(base), scope, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %#lx, %#lx, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, serverctrls, clientctrls, timelimit, sizelimit, message ); if (!ld) return ~0u; @@ -203,7 +203,7 @@ ULONG CDECL ldap_search_ext_sA( LDAP *ld, char *base, ULONG scope, char *filter, WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL; LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, %p, 0x%08x, %p)\n", ld, debugstr_a(base), scope, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %p, %#lx, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res ); if (!ld || !res) return LDAP_PARAM_ERROR; @@ -262,7 +262,7 @@ ULONG CDECL ldap_search_ext_sW( LDAP *ld, WCHAR *base, ULONG scope, WCHAR *filte struct timevalU timevalU; void *msgU = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, %p, 0x%08x, %p)\n", ld, debugstr_w(base), scope, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p, %p, %#lx, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, serverctrls, clientctrls, timeout, sizelimit, res ); if (!ld || !res) return LDAP_PARAM_ERROR; @@ -320,7 +320,7 @@ ULONG CDECL ldap_search_sA( LDAP *ld, char *base, ULONG scope, char *filter, cha ULONG ret = LDAP_NO_MEMORY; WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly, res ); if (!ld || !res) return LDAP_PARAM_ERROR; @@ -363,7 +363,7 @@ exit: ULONG CDECL ldap_search_sW( LDAP *ld, WCHAR *base, ULONG scope, WCHAR *filter, WCHAR **attrs, ULONG attrsonly, LDAPMessage **res ) { - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, res ); return ldap_search_ext_sW( ld, base, scope, filter, attrs, attrsonly, NULL, NULL, NULL, 0, res ); } @@ -379,7 +379,7 @@ ULONG CDECL ldap_search_stA( LDAP *ld, const PCHAR base, ULONG scope, const PCHA ULONG ret = LDAP_NO_MEMORY; WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL; - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p)\n", ld, debugstr_a(base), scope, debugstr_a(filter), attrs, attrsonly, timeout, res ); if (!ld || !res) return LDAP_PARAM_ERROR; @@ -423,7 +423,7 @@ exit: ULONG CDECL ldap_search_stW( LDAP *ld, const PWCHAR base, ULONG scope, const PWCHAR filter, WCHAR **attrs, ULONG attrsonly, struct l_timeval *timeout, LDAPMessage **res ) { - TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, + TRACE( "(%p, %s, %#lx, %s, %p, %#lx, %p, %p)\n", ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, timeout, res ); return ldap_search_ext_sW( ld, base, scope, filter, attrs, attrsonly, NULL, NULL, timeout, 0, res ); } diff --git a/dlls/wldap32/tests/Makefile.in b/dlls/wldap32/tests/Makefile.in index 7fc7a026023..05fe5b9af6d 100644 --- a/dlls/wldap32/tests/Makefile.in +++ b/dlls/wldap32/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = wldap32.dll IMPORTS = wldap32 diff --git a/dlls/wldap32/tests/ber.c b/dlls/wldap32/tests/ber.c index 56d54fa6f5a..64565efbcbe 100644 --- a/dlls/wldap32/tests/ber.c +++ b/dlls/wldap32/tests/ber.c @@ -41,7 +41,7 @@ static void test_ber_printf(void) ret = ber_flatten( ber, &bv ); ok( !ret, "got %d\n", ret ); - todo_wine ok( bv->bv_len == 12, "got %d\n", bv->bv_len ); + todo_wine ok( bv->bv_len == 12, "got %ld\n", bv->bv_len ); if (bv->bv_len == 12) ok( !memcmp( bv->bv_val, "0\x84\x00\x00\x00\x06\x02\x04\xff\xff\xff\xff", 12 ), "got %s\n", wine_dbgstr_an(bv->bv_val, 12) ); ber_bvfree( bv ); diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 8deebcbc6bf..8ed95dd03f2 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -51,7 +51,7 @@ static void test_ldap_parse_sort_control( LDAP *ld ) sortkeys[0] = &key; sortkeys[1] = NULL; ret = ldap_create_sort_controlA( ld, sortkeys, 0, &sort ); - ok( !ret, "ldap_create_sort_controlA failed 0x%x\n", ret ); + ok( !ret, "ldap_create_sort_controlA failed %#lx\n", ret ); ctrls[0] = sort; ctrls[1] = NULL; @@ -64,33 +64,33 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ldap_control_freeA( sort ); return; } - ok( !ret, "ldap_search_ext_sA failed 0x%x\n", ret ); + ok( !ret, "ldap_search_ext_sA failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); if (GetProcAddress(GetModuleHandleA("wldap32.dll"), "ber_init")) { ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); - ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed 0x%x\n", ret ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed %#lx\n", ret ); } else win_skip("Test would crash on older wldap32 versions\n"); result = ~0u; ret = ldap_parse_resultA( ld, res, &result, NULL, NULL, NULL, &server_ctrls, 1 ); - ok( !ret, "ldap_parse_resultA failed 0x%x\n", ret ); - ok( !result, "got 0x%x expected 0\n", result ); + ok( !ret, "ldap_parse_resultA failed %#lx\n", ret ); + ok( !result, "got %#lx expected 0\n", result ); ret = ldap_parse_sort_controlA( NULL, NULL, NULL, NULL ); - ok( ret == LDAP_PARAM_ERROR, "ldap_parse_sort_controlA failed 0x%d\n", ret ); + ok( ret == LDAP_PARAM_ERROR, "ldap_parse_sort_controlA failed %#lx\n", ret ); ret = ldap_parse_sort_controlA( ld, NULL, NULL, NULL ); - ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed 0x%x\n", ret ); + ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed %#lx\n", ret ); ret = ldap_parse_sort_controlA( ld, NULL, &result, NULL ); - ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed 0x%x\n", ret ); + ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed %#lx\n", ret ); ret = ldap_parse_sort_controlA( ld, server_ctrls, &result, NULL ); - ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed 0x%x\n", ret ); + ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed %#lx\n", ret ); ldap_control_freeA( sort ); ldap_controls_freeA( server_ctrls ); @@ -108,11 +108,11 @@ static void test_ldap_search_extW( LDAP *ld ) skip("test server can't be reached\n"); return; } - ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); + ok( !ret, "ldap_search_extW failed %#lx\n", ret ); timelimit = 0; ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); - ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); + ok( !ret, "ldap_search_extW failed %#lx\n", ret ); } static void test_ldap_set_optionW( LDAP *ld ) @@ -127,10 +127,10 @@ static void test_ldap_set_optionW( LDAP *ld ) } ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF ); - ok( !ret || broken(ret == LDAP_PARAM_ERROR) /* nt4, win2k */, "ldap_set_optionW failed 0x%08x\n", ret ); + ok( !ret || broken(ret == LDAP_PARAM_ERROR) /* nt4, win2k */, "ldap_set_optionW failed %#lx\n", ret ); ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, (void *)&oldvalue ); - ok( !ret, "ldap_set_optionW failed 0x%08x\n", ret ); + ok( !ret, "ldap_set_optionW failed %#lx\n", ret ); } static void test_ldap_get_optionW( LDAP *ld ) @@ -138,8 +138,8 @@ static void test_ldap_get_optionW( LDAP *ld ) ULONG ret, version; ret = ldap_get_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); - ok( !ret, "ldap_get_optionW failed 0x%08x\n", ret ); - ok( version == LDAP_VERSION3, "got %u\n", version ); + ok( !ret, "ldap_get_optionW failed %#lx\n", ret ); + ok( version == LDAP_VERSION3, "got %lu\n", version ); } static void test_ldap_bind_sA( void ) @@ -161,10 +161,10 @@ static void test_ldap_bind_sA( void ) } ret = ldap_connect( ld, NULL ); - ok( !ret, "ldap_connect failed 0x%08x\n", ret ); + ok( !ret, "ldap_connect failed %#lx\n", ret ); ret = ldap_bind_sA( ld, (char *)"CN=read-only-admin,DC=example,DC=com", (char *)"password", LDAP_AUTH_SIMPLE ); - ok( !ret, "ldap_bind_s failed 0x%08x\n", ret ); + ok( !ret, "ldap_bind_s failed %#lx\n", ret ); ldap_unbind( ld ); } @@ -192,7 +192,7 @@ static void test_ldap_server_control( void ) } ret = ldap_connect( ld, NULL ); - ok( !ret, "ldap_connect failed 0x%08x\n", ret ); + ok( !ret, "ldap_connect failed %#lx\n", ret ); /* test setting a not supported server control */ mask.ldctl_oid = (WCHAR *)L"1.2.840.113556.1.4.801"; @@ -202,11 +202,11 @@ static void test_ldap_server_control( void ) ctrls[0] = &mask; ctrls[1] = NULL; ret = ldap_set_optionW(ld, LDAP_OPT_SERVER_CONTROLS, ctrls); - ok( ret == LDAP_PARAM_ERROR, "ldap_set_optionW should fail: 0x%x\n", ret ); + ok( ret == LDAP_PARAM_ERROR, "ldap_set_optionW should fail: %#lx\n", ret ); res = NULL; ret = ldap_search_sA( ld, (char *)"OU=scientists,DC=example,DC=com", LDAP_SCOPE_BASE, (char *)"(objectclass=*)", NULL, FALSE, &res ); - ok( !ret, "ldap_search_sA failed 0x%x\n", ret ); + ok( !ret, "ldap_search_sA failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); ldap_msgfree( res ); @@ -242,12 +242,12 @@ static void test_ldap_paged_search(void) count = 0xdeadbeef; res = NULL; ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res ); - ok( !ret, "ldap_get_next_page_s failed 0x%x\n", ret ); + ok( !ret, "ldap_get_next_page_s failed %#lx\n", ret ); ok( res != NULL, "expected res != NULL\n" ); - ok( count == 0, "got %u\n", count ); + ok( count == 0, "got %lu\n", count ); count = ldap_count_entries( ld, res); - ok( count == 1, "got %u\n", count ); + ok( count == 1, "got %lu\n", count ); entry = ldap_first_entry( ld, res); ok( res != NULL, "expected entry != NULL\n" ); @@ -264,9 +264,9 @@ static void test_ldap_paged_search(void) count = 0xdeadbeef; res = (void *)0xdeadbeef; ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res ); - ok( ret == LDAP_NO_RESULTS_RETURNED, "got 0x%x\n", ret ); + ok( ret == LDAP_NO_RESULTS_RETURNED, "got %#lx\n", ret ); ok( !res, "expected res == NULL\n" ); - ok( count == 0, "got %u\n", count ); + ok( count == 0, "got %lu\n", count ); ldap_search_abandon_page( ld, search ); ldap_unbind( ld ); -- 2.30.2

1 0

[PATCH] xinput1_3: Use WM_DEVICECHANGE device path to add or remove devices.
by Rémi Bernon Feb. 15, 2022

Feb. 15, 2022

Instead of iterating the entire device list every time. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/main.c | 95 ++++++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 18f4546de9f..c8ce6622dcb 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -127,7 +127,7 @@ static HANDLE stop_event; static HANDLE done_event; static HANDLE update_event; -static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) +static BOOL find_opened_device(const WCHAR *device_path, int *free_slot) { int i; @@ -135,7 +135,7 @@ static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *f for (i = XUSER_MAX_COUNT; i > 0; i--) { if (!controllers[i - 1].device) *free_slot = i - 1; - else if (!wcscmp(detail->DevicePath, controllers[i - 1].device_path)) return TRUE; + else if (!wcsicmp(device_path, controllers[i - 1].device_path)) return TRUE; } return FALSE; } @@ -411,7 +411,7 @@ static void controller_disable(struct xinput_controller *controller) } static BOOL controller_init(struct xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, - HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) + HIDP_CAPS *caps, HANDLE device, const WCHAR *device_path) { HANDLE event = NULL; @@ -493,19 +493,60 @@ static BOOL device_is_overriden(HANDLE device) return disable; } +static BOOL try_add_device(const WCHAR *device_path) +{ + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + PHIDP_PREPARSED_DATA preparsed; + HIDP_CAPS caps; + NTSTATUS status; + HANDLE device; + int i; + + if (find_opened_device(device_path, &i)) return TRUE; /* already opened */ + if (i == XUSER_MAX_COUNT) return FALSE; /* no more slots */ + + device = CreateFileW(device_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); + if (device == INVALID_HANDLE_VALUE) return TRUE; + + preparsed = NULL; + if (!HidD_GetPreparsedData(device, &preparsed)) + WARN("ignoring HID device, HidD_GetPreparsedData failed with error %lu\n", GetLastError()); + else if ((status = HidP_GetCaps(preparsed, &caps)) != HIDP_STATUS_SUCCESS) + WARN("ignoring HID device, HidP_GetCaps returned %#lx\n", status); + else if (caps.UsagePage != HID_USAGE_PAGE_GENERIC) + WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); + else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && + caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) + WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); + else if (device_is_overriden(device)) + WARN("ignoring HID device, overriden for dinput\n"); + else if (!controller_init(&controllers[i], preparsed, &caps, device, device_path)) + WARN("ignoring HID device, failed to initialize\n"); + else + return TRUE; + + CloseHandle(device); + HidD_FreePreparsedData(preparsed); + return TRUE; +} + +static void try_remove_device(const WCHAR *device_path) +{ + int i; + + if (find_opened_device(device_path, &i)) + controller_destroy(&controllers[i], TRUE); +} + static void update_controller_list(void) { char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; - PHIDP_PREPARSED_DATA preparsed; - HIDP_CAPS caps; - NTSTATUS status; HDEVINFO set; - HANDLE device; DWORD idx; GUID guid; - int i; guid = GUID_DEVINTERFACE_WINEXINPUT; @@ -517,34 +558,8 @@ static void update_controller_list(void) { if (!SetupDiGetDeviceInterfaceDetailW(set, &iface, detail, sizeof(buffer), NULL, NULL)) continue; - - if (find_opened_device(detail, &i)) continue; /* already opened */ - if (i == XUSER_MAX_COUNT) break; /* no more slots */ - - device = CreateFileW(detail->DevicePath, GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, - FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); - if (device == INVALID_HANDLE_VALUE) continue; - - preparsed = NULL; - if (!HidD_GetPreparsedData(device, &preparsed)) - WARN("ignoring HID device, HidD_GetPreparsedData failed with error %lu\n", GetLastError()); - else if ((status = HidP_GetCaps(preparsed, &caps)) != HIDP_STATUS_SUCCESS) - WARN("ignoring HID device, HidP_GetCaps returned %#lx\n", status); - else if (caps.UsagePage != HID_USAGE_PAGE_GENERIC) - WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); - else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && - caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) - WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (device_is_overriden(device)) - WARN("ignoring HID device, overriden for dinput\n"); - else if (!controller_init(&controllers[i], preparsed, &caps, device, detail->DevicePath)) - WARN("ignoring HID device, failed to initialize\n"); - else - continue; - - CloseHandle(device); - HidD_FreePreparsedData(preparsed); + if (!try_add_device(detail->DevicePath)) + break; } SetupDiDestroyDeviceInfoList(set); @@ -698,7 +713,13 @@ static void read_controller_state(struct xinput_controller *controller) static LRESULT CALLBACK xinput_devnotify_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - if (msg == WM_DEVICECHANGE && wparam == DBT_DEVICEARRIVAL) update_controller_list(); + if (msg == WM_DEVICECHANGE) + { + DEV_BROADCAST_DEVICEINTERFACE_W *iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)lparam; + if (wparam == DBT_DEVICEARRIVAL) try_add_device(iface->dbcc_name); + if (wparam == DBT_DEVICEREMOVECOMPLETE) try_remove_device(iface->dbcc_name); + } + return DefWindowProcW(hwnd, msg, wparam, lparam); } -- 2.34.1

1 0

[PATCH 1/5] xinput1_3: Use the implicit Stop waveform ordinal to stop the effects.
by Rémi Bernon Feb. 15, 2022

Feb. 15, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/xinput1_3/main.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index e669fa0af71..2179da1db72 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -81,6 +81,8 @@ struct xinput_controller char *feature_report_buf; BYTE haptics_report; + BYTE haptics_none_ordinal; + BYTE haptics_stop_ordinal; BYTE haptics_rumble_ordinal; BYTE haptics_buzz_ordinal; } hid; @@ -244,6 +246,8 @@ static BOOL controller_check_caps(struct xinput_controller *controller, HANDLE d return TRUE; } + controller->hid.haptics_none_ordinal = 1; /* implicit None waveform ordinal, from the HID spec */ + controller->hid.haptics_stop_ordinal = 2; /* implicit Stop waveform ordinal, from the HID spec */ controller->hid.haptics_buzz_ordinal = 0; controller->hid.haptics_rumble_ordinal = 0; for (i = 3; status == HIDP_STATUS_SUCCESS; ++i) @@ -291,6 +295,22 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO if (!controller->enabled) return ERROR_SUCCESS; + if (!state->wLeftMotorSpeed && !state->wRightMotorSpeed) + { + status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); + status = HidP_SetUsageValue(HidP_Output, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_MANUAL_TRIGGER, + controller->hid.haptics_stop_ordinal, preparsed, report_buf, report_len); + if (status != HIDP_STATUS_SUCCESS) WARN("HidP_SetUsageValue MANUAL_TRIGGER returned %#lx\n", status); + if (!HidD_SetOutputReport(controller->device, report_buf, report_len)) + { + WARN("HidD_SetOutputReport failed with error %lu\n", GetLastError()); + return GetLastError(); + } + + return 0; + } + /* send haptics rumble report (left motor) */ status = HidP_InitializeReportForID(HidP_Output, report_id, preparsed, report_buf, report_len); if (status != HIDP_STATUS_SUCCESS) WARN("HidP_InitializeReportForID returned %#lx\n", status); -- 2.34.1

1 4

[PATCH v2 1/2] httpapi: Build without -DWINE_NO_LONG_TYPES.
by Zebediah Figura Feb. 15, 2022

Feb. 15, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Fix the subject. dlls/httpapi/Makefile.in | 1 - dlls/httpapi/httpapi_main.c | 54 ++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/httpapi/Makefile.in b/dlls/httpapi/Makefile.in index ea9c4223059..94020e9c17e 100644 --- a/dlls/httpapi/Makefile.in +++ b/dlls/httpapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = httpapi.dll IMPORTLIB = httpapi IMPORTS = advapi32 diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 52fa6cc1d80..4d2d307ffcb 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -53,12 +53,12 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved { SC_HANDLE manager, service; - TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion, + TRACE("version %u.%u, flags %#lx, reserved %p.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, flags, reserved); if (flags & ~HTTP_INITIALIZE_SERVER) { - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); return ERROR_SUCCESS; } @@ -67,14 +67,14 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved if (!(service = OpenServiceW(manager, L"http", SERVICE_START))) { - ERR("Failed to open HTTP service, error %u.\n", GetLastError()); + ERR("Failed to open HTTP service, error %lu.\n", GetLastError()); CloseServiceHandle(manager); return GetLastError(); } if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) { - ERR("Failed to start HTTP service, error %u.\n", GetLastError()); + ERR("Failed to start HTTP service, error %lu.\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); return GetLastError(); @@ -100,7 +100,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved */ ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) { - FIXME( "(0x%x, %p): stub!\n", flags, reserved ); + FIXME( "(0x%lx, %p): stub!\n", flags, reserved ); return NO_ERROR; } @@ -123,7 +123,7 @@ ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved ) ULONG WINAPI HttpDeleteServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, PVOID config, ULONG length, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + FIXME( "(%p, %d, %p, %ld, %p): stub!\n", handle, type, config, length, overlapped ); return NO_ERROR; } @@ -150,7 +150,7 @@ ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_I PVOID query, ULONG query_len, PVOID buffer, ULONG buffer_len, PULONG data_len, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p, %d, %p, %p): stub!\n", handle, type, query, query_len, + FIXME( "(%p, %d, %p, %ld, %p, %ld, %p, %p): stub!\n", handle, type, query, query_len, buffer, buffer_len, data_len, overlapped ); return ERROR_FILE_NOT_FOUND; } @@ -174,7 +174,7 @@ ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_I ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type, PVOID config, ULONG length, LPOVERLAPPED overlapped ) { - FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); + FIXME( "(%p, %d, %p, %ld, %p): stub!\n", handle, type, config, length, overlapped ); return NO_ERROR; } @@ -197,7 +197,7 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved) UNICODE_STRING string; IO_STATUS_BLOCK iosb; - TRACE("handle %p, reserved %#x.\n", handle, reserved); + TRACE("handle %p, reserved %#lx.\n", handle, reserved); if (!handle) return ERROR_INVALID_PARAMETER; @@ -289,11 +289,11 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON ULONG ret = ERROR_SUCCESS; OVERLAPPED sync_ovl; - TRACE("queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#lx, buffer %p, size %#lx, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, buffer, size, ret_size, ovl); if (flags) - FIXME("Ignoring flags %#x.\n", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!ovl) { @@ -334,11 +334,11 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag ULONG ret = ERROR_SUCCESS; OVERLAPPED sync_ovl; - TRACE("queue %p, id %s, flags %#x, request %p, size %#x, ret_size %p, ovl %p.\n", + TRACE("queue %p, id %s, flags %#lx, request %p, size %#lx, ret_size %p, ovl %p.\n", queue, wine_dbgstr_longlong(id), flags, request, size, ret_size, ovl); if (flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY) - FIXME("Ignoring flags %#x.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); + FIXME("Ignoring flags %#lx.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY); if (size < sizeof(HTTP_REQUEST_V1)) return ERROR_INSUFFICIENT_BUFFER; @@ -426,15 +426,15 @@ ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, char *p, dummy[12]; USHORT i; - TRACE("queue %p, id %s, flags %#x, response %p, cache_policy %p, " - "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p.\n", + TRACE("queue %p, id %s, flags %#lx, response %p, cache_policy %p, " + "ret_size %p, reserved1 %p, reserved2 %#lx, ovl %p, log_data %p.\n", queue, wine_dbgstr_longlong(id), flags, response, cache_policy, ret_size, reserved1, reserved2, ovl, log_data); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); if (response->s.Flags) - FIXME("Unhandled response flags %#x.\n", response->s.Flags); + FIXME("Unhandled response flags %#lx.\n", response->s.Flags); if (cache_policy) WARN("Ignoring cache_policy.\n"); if (log_data) @@ -563,7 +563,7 @@ ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION version, HTTP_SERVER_SESSIO { struct server_session *session; - TRACE("version %u.%u, id %p, reserved %u.\n", version.HttpApiMajorVersion, + TRACE("version %u.%u, id %p, reserved %lu.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved); if (!id) @@ -613,7 +613,7 @@ ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROU struct server_session *session; struct url_group *group; - TRACE("session_id %s, group_id %p, reserved %#x.\n", + TRACE("session_id %s, group_id %p, reserved %#lx.\n", wine_dbgstr_longlong(session_id), group_id, reserved); if (!(session = get_server_session(session_id))) @@ -655,7 +655,7 @@ ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY { struct url_group *group = get_url_group(id); - TRACE("id %s, property %u, value %p, length %u.\n", + TRACE("id %s, property %u, value %p, length %lu.\n", wine_dbgstr_longlong(id), property, value, length); switch (property) @@ -687,7 +687,7 @@ ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, { struct url_group *group = get_url_group(id); - TRACE("id %s, url %s, context %s, reserved %#x.\n", wine_dbgstr_longlong(id), + TRACE("id %s, url %s, context %s, reserved %#lx.\n", wine_dbgstr_longlong(id), debugstr_w(url), wine_dbgstr_longlong(context), reserved); if (group->url) @@ -713,13 +713,13 @@ ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, U { struct url_group *group = get_url_group(id); - TRACE("id %s, url %s, flags %#x.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); + TRACE("id %s, url %s, flags %#lx.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags); if (!group->url) return ERROR_FILE_NOT_FOUND; if (flags) - FIXME("Ignoring flags %#x.\n", flags); + FIXME("Ignoring flags %#lx.\n", flags); heap_free(group->url); group->url = NULL; @@ -740,14 +740,14 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name, UNICODE_STRING string; IO_STATUS_BLOCK iosb; - TRACE("version %u.%u, name %s, sa %p, flags %#x, handle %p.\n", + TRACE("version %u.%u, name %s, sa %p, flags %#lx, handle %p.\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, debugstr_w(name), sa, flags, handle); if (name) FIXME("Unhandled name %s.\n", debugstr_w(name)); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); attr.ObjectName = &string; @@ -775,7 +775,7 @@ ULONG WINAPI HttpCloseRequestQueue(HANDLE handle) ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property, void *value, ULONG length, ULONG reserved1, void *reserved2) { - FIXME("queue %p, property %u, value %p, length %u, reserved1 %#x, reserved2 %p, stub!\n", + FIXME("queue %p, property %u, value %p, length %lu, reserved1 %#lx, reserved2 %p, stub!\n", queue, property, value, length, reserved1, reserved2); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -786,7 +786,7 @@ ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY prop ULONG WINAPI HttpSetServerSessionProperty(HTTP_SERVER_SESSION_ID id, HTTP_SERVER_PROPERTY property, void *value, ULONG length) { - TRACE("id %s, property %u, value %p, length %u.\n", + TRACE("id %s, property %u, value %p, length %lu.\n", wine_dbgstr_longlong(id), property, value, length); switch (property) -- 2.34.1

1 1

[PATCH resend] include: Add single-producer single-consumer ringbuffer implementation.
by me＠davidebeatrici.dev Feb. 15, 2022

Feb. 15, 2022

Please note that I wrote a test for the ringbuffer, but I'm not sure where I should put it in the repository.

1 0

[tools 1/3] testbot/LibvirtTool: Wait a bit between shutting down and reverting a VM.
by Francois Gouget Feb. 15, 2022

Feb. 15, 2022

Also rename ShutDown() to the more descriptive ShutDownIfOffSnapshot() and document it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Without this delay reverting from a PCI-passthrough configuration to a regular VGA live snapshot sometimes results in a black VM screen. --- testbot/bin/LibvirtTool.pl | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index ef94a2be09..1fc7dc1d4c 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -280,7 +280,20 @@ sub GetPrivilegedTA($) return $TA->SetTime() ? $TA : $VM->GetAgent(1); } -sub ShutDown() +=pod +=over 12 + +=item C<ShutDownIfOffSnapshot()> + +Attempt a clean shutdown of the VM if it is running a snapshot that requests +them (snapshot name containing '-off'). + +Returns 0 if the shutdown failed, 2 if it was successful and 1 if the VM was +already powered off or a shutdown was not needed. +=back +=cut + +sub ShutDownIfOffSnapshot() { my $Domain = $VM->GetDomain(); my $CurrentSnapshot = $Domain->GetSnapshotName(); @@ -311,7 +324,7 @@ sub ShutDown() { Debug(Elapsed($Start), " Successfully shut down $VMKey\n"); LogMsg "Successfully shut down $VMKey\n"; - return 1; + return 2; } sleep(1); } @@ -365,7 +378,7 @@ sub Monitor() if ($IsReady and $VM->GetDomain()->IsPoweredOn()) { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); my $ErrMessage = $VM->GetDomain()->PowerOff(); if (defined $ErrMessage) @@ -391,7 +404,7 @@ sub Monitor() sub PowerOff() { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); # Power off the VM no matter what its initial status is $CurrentStatus = $VM->Status; @@ -431,7 +444,7 @@ sub CheckOff() if ($SnapshotName eq $VM->IdleSnapshot) { # Try to perform a clean shutdown if requested - ShutDown(); + ShutDownIfOffSnapshot(); my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); @@ -612,8 +625,10 @@ sub Revert() $VM->Save(); } - # Before reverting, try to perform a clean shutdown if requested - ShutDown(); + # Before reverting, try to perform a clean shutdown if requested. + # After a shutdown a small wait is also sometimes required, at least when + # switching from a PCI-passthrough configuration to a regular one. + sleep(1) if (ShutDownIfOffSnapshot() == 2); # Revert the VM (and power it on if necessary) Debug(Elapsed($Start), " Reverting $VMKey to $DomainSnapshot\n"); -- 2.30.2

1 2

[PATCH 1/5] kernelbase: Also return E_FAIL when trying to parse username, password, or port for non-Internet URLs.
by Zebediah Figura Feb. 15, 2022

Feb. 15, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernelbase/path.c | 34 ++++++++++++++++++---------------- dlls/shlwapi/tests/url.c | 6 +++--- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b753ce3dd2e..28717c25f79 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4329,6 +4329,24 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p hr = parse_url(url, &pl); + switch (scheme) + { + case URL_SCHEME_FILE: + case URL_SCHEME_FTP: + case URL_SCHEME_GOPHER: + case URL_SCHEME_HTTP: + case URL_SCHEME_HTTPS: + case URL_SCHEME_TELNET: + case URL_SCHEME_NEWS: + case URL_SCHEME_NNTP: + case URL_SCHEME_SNEWS: + break; + + default: + if (part != URL_PART_SCHEME && part != URL_PART_QUERY) + return E_FAIL; + } + switch (part) { case URL_PART_SCHEME: @@ -4344,22 +4362,6 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p break; case URL_PART_HOSTNAME: - switch (scheme) - { - case URL_SCHEME_FILE: - case URL_SCHEME_FTP: - case URL_SCHEME_GOPHER: - case URL_SCHEME_HTTP: - case URL_SCHEME_HTTPS: - case URL_SCHEME_TELNET: - case URL_SCHEME_NEWS: - case URL_SCHEME_NNTP: - case URL_SCHEME_SNEWS: - break; - default: - return E_FAIL; - } - if (scheme == URL_SCHEME_FILE && (!pl.hostname_len || (pl.hostname_len == 1 && *(pl.hostname + 1) == ':'))) { *out = '\0'; diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 729b069a772..904d3e7bb5b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -601,10 +601,10 @@ static void test_UrlGetPart(void) tests[] = { {"hi", URL_PART_SCHEME, 0, S_FALSE, ""}, - {"hi", URL_PART_USERNAME, 0, E_FAIL, .todo_hr = TRUE}, - {"hi", URL_PART_PASSWORD, 0, E_FAIL, .todo_hr = TRUE}, + {"hi", URL_PART_USERNAME, 0, E_FAIL}, + {"hi", URL_PART_PASSWORD, 0, E_FAIL}, {"hi", URL_PART_HOSTNAME, 0, E_FAIL}, - {"hi", URL_PART_PORT, 0, E_FAIL, .todo_hr = TRUE}, + {"hi", URL_PART_PORT, 0, E_FAIL}, {"hi", URL_PART_QUERY, 0, S_FALSE, ""}, {"http://foo:bar(a)localhost:21/internal.php?query=x&return=y", URL_PART_SCHEME, 0, S_OK, "http"}, -- 2.34.1

1 4

[PATCH] include: Add missing CreateProcessWithTokenW() declaration.
by Zebediah Figura Feb. 15, 2022

Feb. 15, 2022

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..a8744eb417a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1901,6 +1901,7 @@ WINBASEAPI BOOL WINAPI CreateProcessInternalA(HANDLE,LPCSTR,LPSTR,LPSECUR WINBASEAPI BOOL WINAPI CreateProcessInternalW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION,HANDLE*); #define CreateProcessInternal WINELIB_NAME_AW(CreateProcessInternal) WINADVAPI BOOL WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); +WINADVAPI BOOL WINAPI CreateProcessWithTokenW(HANDLE,DWORD,LPCWSTR,LPWSTR,DWORD,void *,LPCWSTR,STARTUPINFOW *,PROCESS_INFORMATION *); WINBASEAPI HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateRemoteThreadEx(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPPROC_THREAD_ATTRIBUTE_LIST,LPDWORD); WINADVAPI BOOL WINAPI CreateRestrictedToken(HANDLE,DWORD,DWORD,PSID_AND_ATTRIBUTES,DWORD,PLUID_AND_ATTRIBUTES,DWORD,PSID_AND_ATTRIBUTES,PHANDLE); -- 2.34.1

1 0

[PATCH] ntdll: Fix the spelling of SystemPrioritySeparation.
by Francois Gouget Feb. 15, 2022

Feb. 15, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I see no evidence that Microsoft has misspelled this constant... because as far as I can tell it's not defined in the Windows headers. Also online I find about as many places where it is misspelled as places that have it spelled correctly. So I'd be in favor of using the correct spelling. --- include/winternl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index 5be28856920..81fd5f45665 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1624,7 +1624,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { SystemContextSwitchInformation = 36, SystemRegistryQuotaInformation = 37, SystemExtendServiceTableInformation = 38, - SystemPrioritySeperation = 39, + SystemPrioritySeparation = 39, SystemVerifierAddDriverInformation = 40, SystemVerifierRemoveDriverInformation = 41, SystemProcessorIdleInformation = 42, -- 2.30.2

1 0

[PATCH] ntdll: Use YieldProcessor() in RtlEnterCriticalSection().
by Zebediah Figura Feb. 15, 2022

Feb. 15, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/sync.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 06b594c633f..43864325b35 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -373,15 +373,6 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) } -static inline void small_pause(void) -{ -#ifdef __i386__ - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#else - __asm__ __volatile__( "" : : : "memory" ); -#endif -} - /****************************************************************************** * RtlEnterCriticalSection (NTDLL.@) */ @@ -399,7 +390,7 @@ NTSTATUS WINAPI RtlEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) { if (InterlockedCompareExchange( &crit->LockCount, 0, -1 ) == -1) goto done; } - small_pause(); + YieldProcessor(); } } -- 2.34.1

1 0

[PATCH] include: Add single-producer single-consumer ringbuffer implementation.
by me＠davidebeatrici.dev Feb. 15, 2022

Feb. 15, 2022

Please note that I wrote a test for the ringbuffer, but I'm not sure where I should put it in the repository.

1 0

[PATCH v3 1/4] d3dx9: Do not use d3dx_effect_cleanup() in D3DXCreateEffectEx().
by Zebediah Figura Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 57 +++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 310e5c0bf17..6ea138e632f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6422,15 +6422,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) - { - effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); - pool->lpVtbl->AddRef(pool); - } - - IDirect3DDevice9_AddRef(device); - effect->device = device; - effect->flags = flags; list_init(&effect->parameter_block_list); @@ -6487,6 +6478,15 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev TRACE("Tag: %x\n", tag); } + if (pool) + { + effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); + pool->lpVtbl->AddRef(pool); + } + + IDirect3DDevice9_AddRef(device); + effect->device = device; + if (skip_constants_string) { skip_constants_buffer = HeapAlloc(GetProcessHeap(), 0, @@ -6495,7 +6495,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev { if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } strcpy(skip_constants_buffer, skip_constants_string); @@ -6504,7 +6505,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev HeapFree(GetProcessHeap(), 0, skip_constants_buffer); if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } } read_dword(&ptr, &offset); @@ -6518,7 +6520,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev FIXME("Failed to parse effect.\n"); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return hr; + goto fail; } for (i = 0; i < skip_constants_count; ++i) @@ -6535,7 +6537,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return D3DERR_INVALIDCALL; + hr = D3DERR_INVALIDCALL; + goto fail; } } } @@ -6557,6 +6560,33 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev } return D3D_OK; + +fail: + if (effect->techniques) + { + for (i = 0; i < effect->technique_count; ++i) + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + } + + if (effect->parameters) + { + for (i = 0; i < effect->parameter_count; ++i) + free_top_level_parameter(&effect->parameters[i]); + heap_free(effect->parameters); + } + + if (effect->objects) + { + for (i = 0; i < effect->object_count; ++i) + free_object(&effect->objects[i]); + heap_free(effect->objects); + } + + IDirect3DDevice9_Release(effect->device); + if (pool) + pool->lpVtbl->Release(pool); + return hr; } HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, @@ -6593,7 +6623,6 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (FAILED(hr)) { WARN("Failed to create effect object, hr %#x.\n", hr); - d3dx_effect_cleanup(object); return hr; } -- 2.34.1

3 8

[PATCH 1/7] mfplat/tests: Check that buffers are properly aligned.
by Giovanni Mascellani Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f89a5202d80..0d86f041c1e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2248,10 +2248,10 @@ static void test_system_memory_buffer(void) IMFMediaBuffer_Release(buffer); /* Aligned buffer. */ - hr = MFCreateAlignedMemoryBuffer(16, MF_8_BYTE_ALIGNMENT, NULL); + hr = MFCreateAlignedMemoryBuffer(16, MF_512_BYTE_ALIGNMENT, NULL); ok(FAILED(hr), "Unexpected hr %#x.\n", hr); - hr = MFCreateAlignedMemoryBuffer(201, MF_8_BYTE_ALIGNMENT, &buffer); + hr = MFCreateAlignedMemoryBuffer(201, MF_512_BYTE_ALIGNMENT, &buffer); ok(hr == S_OK, "Failed to create memory buffer, hr %#x.\n", hr); hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); @@ -2279,6 +2279,8 @@ static void test_system_memory_buffer(void) hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); ok(hr == S_OK, "Failed to lock, hr %#x.\n", hr); ok(max == 201 && length == 10, "Unexpected length.\n"); + todo_wine + ok(((uintptr_t)data & MF_512_BYTE_ALIGNMENT) == 0, "Data at %p is insufficiently aligned.\n", data); hr = IMFMediaBuffer_Unlock(buffer); ok(hr == S_OK, "Failed to unlock, hr %#x.\n", hr); -- 2.34.1

2 8

[PATCH] dlls/msacm32: use extended structure definition for driver configuration
by Eric Pouech Feb. 14, 2022

Feb. 14, 2022

1a) fixes a too short memory allocation on 64bit (DRVCONFIGINFO is 20 byte large while only 16 bytes were allocated) 1b) incidentally, removes a bunch of GCC11 warnings (generated by 1a) 2) introduces DRVCONFIGINFOEX (note, in SDK, it's defined in mmiscapi.h; since it doesn't exist yet in Wine, I added the structure to mmsystem.h, where DRVCONFIGINFO already exists) 3) initializes the missing field Note: my testing don't show on Win10's msacm32 that DRV_CONFIGURE uses the DRVCONFIGINFOEX structure. So, maybe (wild guess here), the extended structure is only used when the driver is linked to some hardware. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msacm32/driver.c | 18 +++++++++--------- include/mmsystem.h | 6 ++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index a8d6f3cf6d7..036461800b1 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -400,7 +400,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA { PWINE_ACMDRIVERID padid; LRESULT lResult; - LPDRVCONFIGINFO pConfigInfo = NULL; + LPDRVCONFIGINFOEX pConfigInfo = NULL; LPWSTR section_name = NULL; LPWSTR alias_name = NULL; @@ -425,16 +425,15 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA } if (pAlias != NULL) { - /* DRVCONFIGINFO is only 12 bytes long, but native msacm - * reports a 16-byte structure to codecs, so allocate 16 bytes, - * just to be on the safe side. - */ - const unsigned int iStructSize = 16; - pConfigInfo = HeapAlloc(MSACM_hHeap, 0, iStructSize); + pConfigInfo = HeapAlloc(MSACM_hHeap, 0, sizeof(*pConfigInfo)); if (!pConfigInfo) { - ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); + ERR("OOM while supplying DRVCONFIGINFOEX for DRV_CONFIGURE, using NULL\n"); } else { - pConfigInfo->dwDCISize = iStructSize; + /* In some cases (seen in the 32bit world), a DRVCONFIGINFOEX struct is passed + * (with extended size) instead of the documented DRVCONFIGINFO. + * So, always pass a DRVCONFIGINFOEX to be one the safe side + */ + pConfigInfo->dwDCISize = sizeof(*pConfigInfo); section_name = HeapAlloc(MSACM_hHeap, 0, sizeof(L"Drivers32")); if (section_name) lstrcpyW(section_name, L"Drivers32"); @@ -442,6 +441,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA alias_name = HeapAlloc(MSACM_hHeap, 0, (lstrlenW(pAlias) + 1) * sizeof(WCHAR)); if (alias_name) lstrcpyW(alias_name, pAlias); pConfigInfo->lpszDCIAliasName = alias_name; + pConfigInfo->dnDevNode = 0; /* FIXME */ if (pConfigInfo->lpszDCISectionName == NULL || pConfigInfo->lpszDCIAliasName == NULL) { HeapFree(MSACM_hHeap, 0, alias_name); diff --git a/include/mmsystem.h b/include/mmsystem.h index 2a0782d0cb9..5684ff20683 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -225,6 +225,12 @@ typedef struct tagDRVCONFIGINFO { LPCWSTR lpszDCIAliasName; } DRVCONFIGINFO, *LPDRVCONFIGINFO; +typedef struct tagDRVCONFIGINFOEX { + DWORD dwDCISize; + LPCWSTR lpszDCISectionName; + LPCWSTR lpszDCIAliasName; + DWORD dnDevNode; +} DRVCONFIGINFOEX, *LPDRVCONFIGINFOEX; LRESULT WINAPI DefDriverProc(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM); /* this sounds odd, but it's the way it is. OpenDriverA even disappeared

2 1

[PATCH v2 1/2] rsaenh: Store a BCRYPT_HASH_HANDLE in CRYPTHASH.
by Sven Baars Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 20 ++++++++++---------- dlls/rsaenh/implglue.h | 14 +++++--------- dlls/rsaenh/rsaenh.c | 26 +++++++++++++------------- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 9d90ad70f53..d98a08b2f31 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -32,8 +32,8 @@ /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); - -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) + +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) { BCRYPT_ALG_HANDLE provider; NTSTATUS status; @@ -74,27 +74,27 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) if (status) return FALSE; - status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + status = BCryptCreateHash(provider, hash_handle, NULL, 0, NULL, 0, 0); BCryptCloseAlgorithmProvider(provider, 0); return !status; } -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) { - BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); + BCryptHashData(hash_handle, (UCHAR*)pbData, dwDataLen, 0); return TRUE; } -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) { - BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); - BCryptDestroyHash(pHashContext->bcrypt_hash); + BCryptFinishHash(hash_handle, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptDestroyHash(hash_handle); return TRUE; } -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle) { - return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); + return !BCryptDuplicateHash(src_hash_handle, dest_hash_handle, NULL, 0, 0); } BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 9be642e9b60..06fa3f4430a 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,10 +29,6 @@ #define RSAENH_MAX_HASH_SIZE 104 -typedef union tagHASH_CONTEXT { - BCRYPT_HASH_HANDLE bcrypt_hash; -} HASH_CONTEXT; - typedef union tagKEY_CONTEXT { rc2_key rc2; des_key des; @@ -42,12 +38,12 @@ typedef union tagKEY_CONTEXT { rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; -BOOL update_hash_impl(HASH_CONTEXT *pHashContext, const BYTE *pbData, +BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) DECLSPEC_HIDDEN; +BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; -BOOL duplicate_hash_impl(const HASH_CONTEXT *pSrcHashContext, - HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) DECLSPEC_HIDDEN; +BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, + BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index a4deb80b0e1..c913c0c71ee 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -58,7 +58,7 @@ typedef struct tagCRYPTHASH HCRYPTPROV hProv; DWORD dwHashSize; DWORD dwState; - HASH_CONTEXT context; + BCRYPT_HASH_HANDLE hash_handle; BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; PHMAC_INFO pHMACInfo; RSAENH_TLS1PRF_PARAMS tpPRFParams; @@ -627,8 +627,8 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { pAlgInfo = get_algid_info(pCryptHash->hProv, pCryptHash->pHMACInfo->HashAlgid); if (!pAlgInfo) return FALSE; pCryptHash->dwHashSize = pAlgInfo->dwDefaultLen >> 3; - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbInnerString, pCryptHash->pHMACInfo->cbInnerString); } @@ -642,7 +642,7 @@ static inline BOOL init_hash(CRYPTHASH *pCryptHash) { return TRUE; default: - return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->context); + return init_hash_impl(pCryptHash->aiAlgid, &pCryptHash->hash_handle); } } @@ -664,7 +664,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD { case CALG_HMAC: if (pCryptHash->pHMACInfo) - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); break; case CALG_MAC: @@ -677,7 +677,7 @@ static inline void update_hash(CRYPTHASH *pCryptHash, const BYTE *pbData, DWORD break; default: - update_hash_impl(&pCryptHash->context, pbData, dwDataLen); + update_hash_impl(pCryptHash->hash_handle, pbData, dwDataLen); } } @@ -699,15 +699,15 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { if (pCryptHash->pHMACInfo) { BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); memcpy(abHashValue, pCryptHash->abHashValue, pCryptHash->dwHashSize); - init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->context); - update_hash_impl(&pCryptHash->context, + init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); + update_hash_impl(pCryptHash->hash_handle, pCryptHash->pHMACInfo->pbOuterString, pCryptHash->pHMACInfo->cbOuterString); - update_hash_impl(&pCryptHash->context, + update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } break; @@ -718,7 +718,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) { break; default: - finalize_hash_impl(&pCryptHash->context, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); } } @@ -2371,7 +2371,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw if (*phHash != (HCRYPTHASH)INVALID_HANDLE_VALUE) { *pDestHash = *pSrcHash; - duplicate_hash_impl(&pSrcHash->context, &pDestHash->context); + duplicate_hash_impl(pSrcHash->hash_handle, &pDestHash->hash_handle); copy_hmac_info(&pDestHash->pHMACInfo, pSrcHash->pHMACInfo); copy_data_blob(&pDestHash->tpPRFParams.blobLabel, &pSrcHash->tpPRFParams.blobLabel); copy_data_blob(&pDestHash->tpPRFParams.blobSeed, &pSrcHash->tpPRFParams.blobSeed); -- 2.30.0.335.ge6362826a0

3 4

[PATCH 6/6] win32u: Move GetCursorPos implementation from user.
by Jacek Caban Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 13 +------------ dlls/user32/input.c | 28 +--------------------------- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/input.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 7 files changed, 46 insertions(+), 39 deletions(-)

3 2

[PATCH] dinput/tests: Remove an unneeded NULL cast.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dinput/tests/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 71e9f66834c..83635146324 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -3547,7 +3547,7 @@ DWORD WINAPI dinput_test_device_thread( void *stop_event ) ok( !status, "RegSetValueExW returned %#lx\n", status ); status = RegSetValueExW( hkey, L"Caps", 0, REG_BINARY, (void *)&caps, sizeof(caps) ); ok( !status, "RegSetValueExW returned %#lx\n", status ); - status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, (void *)NULL, 0 ); + status = RegSetValueExW( hkey, L"Expect", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#lx\n", status ); status = RegSetValueExW( hkey, L"Input", 0, REG_BINARY, NULL, 0 ); ok( !status, "RegSetValueExW returned %#lx\n", status ); -- 2.30.2

2 1

[PATCH] dinput/tests: Remove spaces before linefeeds.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dinput/tests/keyboard.c | 2 +- dlls/dinput/tests/mouse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index a5dfe5edafc..251a12073df 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -499,7 +499,7 @@ static void test_GetDeviceInfo(IDirectInputA *pDI) hr = IDirectInputDevice_GetDeviceInfo(pKey, (DIDEVICEINSTANCEA *)&inst3A); ok(SUCCEEDED(hr), "got %#lx\n", hr); - ok(instA.dwSize != inst3A.dwSize, "got %ld, %ld \n", instA.dwSize, inst3A.dwSize); + ok(instA.dwSize != inst3A.dwSize, "got %ld, %ld\n", instA.dwSize, inst3A.dwSize); ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n", diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index dc11f4d8ae9..8be808e5da6 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -246,7 +246,7 @@ static void test_GetDeviceInfo(IDirectInputA *pDI) hr = IDirectInputDevice_GetDeviceInfo(pMouse, (DIDEVICEINSTANCEA *)&inst3A); ok(SUCCEEDED(hr), "got %#lx\n", hr); - ok(instA.dwSize != inst3A.dwSize, "got %lu, %lu \n", instA.dwSize, inst3A.dwSize); + ok(instA.dwSize != inst3A.dwSize, "got %lu, %lu\n", instA.dwSize, inst3A.dwSize); ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n", -- 2.30.2

2 1

Re: [PATCH 4/6] dlls/quartz: use VIDEOINFOHEADER instead of partially allocated VIDEOINFO structure
by Zebediah Figura Feb. 14, 2022

Feb. 14, 2022

On 2/14/22 12:27, Eric Pouech wrote: > Le 14/02/2022 à 19:07, Zebediah Figura a écrit : >> On 2/14/22 03:28, Eric Pouech wrote: >>> this fixes a couple of GCC11 warnings (-Wbounds) >>> >>> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> >>> >>> --- >>> dlls/quartz/avidec.c | 9 +++++---- >>> 1 file changed, 5 insertions(+), 4 deletions(-) >>> >>> diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c >>> index f8660890273..1295e8704df 100644 >>> --- a/dlls/quartz/avidec.c >>> +++ b/dlls/quartz/avidec.c >>> @@ -331,7 +331,7 @@ static HRESULT >>> avi_decompressor_source_get_media_type(struct strmbase_pin *iface >>> struct avi_decompressor *filter = >>> impl_from_strmbase_filter(iface->filter); >>> const VIDEOINFOHEADER *sink_format; >>> - VIDEOINFO *format; >>> + VIDEOINFOHEADER *format; >>> if (!filter->sink.pin.peer) >>> return VFW_S_NO_MORE_ITEMS; >>> @@ -363,9 +363,10 @@ static HRESULT >>> avi_decompressor_source_get_media_type(struct strmbase_pin *iface >>> if (IsEqualGUID(formats[index].subtype, >>> &MEDIASUBTYPE_RGB565)) >>> { >>> - format->dwBitMasks[iRED] = 0xf800; >>> - format->dwBitMasks[iGREEN] = 0x07e0; >>> - format->dwBitMasks[iBLUE] = 0x001f; >>> + DWORD *dwBitMasks = (DWORD *)(format + 1); >>> + dwBitMasks[iRED] = 0xf800; >>> + dwBitMasks[iGREEN] = 0x07e0; >>> + dwBitMasks[iBLUE] = 0x001f; >>> mt->cbFormat = offsetof(VIDEOINFO, dwBitMasks[3]); >>> } >>> else >>> >>> >> >> I don't think this is an improvement. >> >> I also don't get the warning with gcc 11.2.0. How exactly are you >> compiling and with which version? >> > Hi Zebdiah > > compiling with stock gcc version from fedora and regular wine's > configure (no parameter added) > > this is what I get with compiling a 64bit tree, configured with > > ./configure --enable-wine64 > > make[1]: Entering directory '/home/eric/work/wine-format/build64' > x86_64-w64-mingw32-gcc -c -o dlls/quartz/avidec.cross.o > /home/eric/work/wine-format/dlls/quartz/avidec.c -Idlls/quartz \ > -I/home/eric/work/wine-format/dlls/quartz -Iinclude > -I/home/eric/work/wine-format/include \ > -I/home/eric/work/wine-format/include/msvcrt -D__WINESRC__ -D_UCRT > -D__WINE_PE_BUILD -Wall \ > -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body > -Wignored-qualifiers -Winit-self \ > -Wno-packed-not-aligned -Wshift-overflow=2 -Wstrict-prototypes > -Wtype-limits \ > -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith > -Wlogical-op -Wabsolute-value \ > -Wno-format -Wformat-overflow -Wnonnull -mcx16 -gdwarf-4 -Wformat -g -O2 > /home/eric/work/wine-format/dlls/quartz/avidec.c: In function > 'avi_decompressor_source_get_media_type': > /home/eric/work/wine-format/dlls/quartz/avidec.c:349:15: warning: array > subscript 'VIDEOINFO {aka struct tagVIDEOINFO}[0]' is partly outside > array bounds of 'unsigned char[100]' [-Warray-bounds] > 349 | format->rcSource = sink_format->rcSource; > | ^~ > /home/eric/work/wine-format/dlls/quartz/avidec.c:345:24: note: > referencing an object of size 100 allocated by 'CoTaskMemAlloc' > 345 | if (!(format = CoTaskMemAlloc(offsetof(VIDEOINFO, > dwBitMasks[3])))) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Okay, I was wrong about my gcc version; for some reason Debian ships gcc and mingw-w64 gcc versions that are different. I think this is a gcc bug. It now warns about *any* access to a structure which was allocated with anything but sizeof(). E.g. the following will generate warnings with -O2 -Warray-bounds=1: -- #include <stddef.h> #include <stdlib.h> struct apple { unsigned int u; char v[10]; }; struct apple *func(void) { struct apple *a = malloc(offsetof(struct apple, v[10])); a->u = 1; a->v[9] = 3; return a; } -- Same with malloc(14). Only malloc(sizeof(struct apple)) works, even though the three expressions are obviously identical. If we must work around this in Wine, I'd rather either disable -Warray-bounds or else just use sizeof() and over-allocate.

1 0

[PATCH 1/2] mfplat/tests: Add a separate test function for MFGetPlaneSize().
by Nikolay Sivov Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 206 ++++++++++++++++++++----------------- 1 file changed, 114 insertions(+), 92 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cabcc1b06b0..50f4e059205 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4117,104 +4117,102 @@ static void test_stream_descriptor(void) IMFStreamDescriptor_Release(stream_desc); } -static void test_MFCalculateImageSize(void) +static const struct image_size_test { - static const struct image_size_test - { - const GUID *subtype; - UINT32 width; - UINT32 height; - UINT32 size; - UINT32 plane_size; /* Matches image size when 0. */ - } - image_size_tests[] = - { - { &MFVideoFormat_RGB8, 3, 5, 20 }, - { &MFVideoFormat_RGB8, 1, 1, 4 }, - { &MFVideoFormat_RGB555, 3, 5, 40 }, - { &MFVideoFormat_RGB555, 1, 1, 4 }, - { &MFVideoFormat_RGB565, 3, 5, 40 }, - { &MFVideoFormat_RGB565, 1, 1, 4 }, - { &MFVideoFormat_RGB24, 3, 5, 60 }, - { &MFVideoFormat_RGB24, 1, 1, 4 }, - { &MFVideoFormat_RGB32, 3, 5, 60 }, - { &MFVideoFormat_RGB32, 1, 1, 4 }, - { &MFVideoFormat_ARGB32, 3, 5, 60 }, - { &MFVideoFormat_ARGB32, 1, 1, 4 }, - { &MFVideoFormat_A2R10G10B10, 3, 5, 60 }, - { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, - { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, - { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + const GUID *subtype; + UINT32 width; + UINT32 height; + UINT32 size; + UINT32 plane_size; /* Matches image size when 0. */ +} +image_size_tests[] = +{ + { &MFVideoFormat_RGB8, 3, 5, 20 }, + { &MFVideoFormat_RGB8, 1, 1, 4 }, + { &MFVideoFormat_RGB555, 3, 5, 40 }, + { &MFVideoFormat_RGB555, 1, 1, 4 }, + { &MFVideoFormat_RGB565, 3, 5, 40 }, + { &MFVideoFormat_RGB565, 1, 1, 4 }, + { &MFVideoFormat_RGB24, 3, 5, 60 }, + { &MFVideoFormat_RGB24, 1, 1, 4 }, + { &MFVideoFormat_RGB32, 3, 5, 60 }, + { &MFVideoFormat_RGB32, 1, 1, 4 }, + { &MFVideoFormat_ARGB32, 3, 5, 60 }, + { &MFVideoFormat_ARGB32, 1, 1, 4 }, + { &MFVideoFormat_A2R10G10B10, 3, 5, 60 }, + { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, + { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, + { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + + /* YUV */ + { &MFVideoFormat_NV12, 1, 3, 9, 4 }, + { &MFVideoFormat_NV12, 1, 2, 6, 3 }, + { &MFVideoFormat_NV12, 2, 2, 6, 6 }, + { &MFVideoFormat_NV12, 3, 2, 12, 9 }, + { &MFVideoFormat_NV12, 4, 2, 12 }, + { &MFVideoFormat_NV12, 320, 240, 115200 }, + { &MFVideoFormat_AYUV, 1, 1, 4 }, + { &MFVideoFormat_AYUV, 2, 1, 8 }, + { &MFVideoFormat_AYUV, 1, 2, 8 }, + { &MFVideoFormat_AYUV, 4, 3, 48 }, + { &MFVideoFormat_AYUV, 320, 240, 307200 }, + { &MFVideoFormat_IMC1, 1, 1, 4 }, + { &MFVideoFormat_IMC1, 2, 1, 4 }, + { &MFVideoFormat_IMC1, 1, 2, 8 }, + { &MFVideoFormat_IMC1, 4, 3, 24 }, + { &MFVideoFormat_IMC1, 320, 240, 153600 }, + { &MFVideoFormat_IMC3, 1, 1, 4 }, + { &MFVideoFormat_IMC3, 2, 1, 4 }, + { &MFVideoFormat_IMC3, 1, 2, 8 }, + { &MFVideoFormat_IMC3, 4, 3, 24 }, + { &MFVideoFormat_IMC3, 320, 240, 153600 }, + { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, + { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, + { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, + { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, + { &MFVideoFormat_IMC2, 4, 2, 12 }, + { &MFVideoFormat_IMC2, 320, 240, 115200 }, + { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, + { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, + { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, + { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, + { &MFVideoFormat_IMC4, 4, 2, 12 }, + { &MFVideoFormat_IMC4, 320, 240, 115200 }, + { &MFVideoFormat_YV12, 1, 1, 3, 1 }, + { &MFVideoFormat_YV12, 2, 1, 3 }, + { &MFVideoFormat_YV12, 1, 2, 6, 3 }, + { &MFVideoFormat_YV12, 4, 3, 18 }, + { &MFVideoFormat_YV12, 320, 240, 115200 }, + + { &MFVideoFormat_I420, 1, 1, 3, 1 }, + { &MFVideoFormat_I420, 2, 1, 3 }, + { &MFVideoFormat_I420, 1, 2, 6, 3 }, + { &MFVideoFormat_I420, 4, 3, 18 }, + { &MFVideoFormat_I420, 320, 240, 115200 }, + + { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + + { &MFVideoFormat_YUY2, 2, 1, 4 }, + { &MFVideoFormat_YUY2, 4, 3, 24 }, + { &MFVideoFormat_YUY2, 128, 128, 32768 }, + { &MFVideoFormat_YUY2, 320, 240, 153600 }, + + { &MFVideoFormat_UYVY, 2, 1, 4 }, + { &MFVideoFormat_UYVY, 4, 3, 24 }, + { &MFVideoFormat_UYVY, 128, 128, 32768 }, + { &MFVideoFormat_UYVY, 320, 240, 153600 }, +}; - /* YUV */ - { &MFVideoFormat_NV12, 1, 3, 9, 4 }, - { &MFVideoFormat_NV12, 1, 2, 6, 3 }, - { &MFVideoFormat_NV12, 2, 2, 6, 6 }, - { &MFVideoFormat_NV12, 3, 2, 12, 9 }, - { &MFVideoFormat_NV12, 4, 2, 12 }, - { &MFVideoFormat_NV12, 320, 240, 115200 }, - { &MFVideoFormat_AYUV, 1, 1, 4 }, - { &MFVideoFormat_AYUV, 2, 1, 8 }, - { &MFVideoFormat_AYUV, 1, 2, 8 }, - { &MFVideoFormat_AYUV, 4, 3, 48 }, - { &MFVideoFormat_AYUV, 320, 240, 307200 }, - { &MFVideoFormat_IMC1, 1, 1, 4 }, - { &MFVideoFormat_IMC1, 2, 1, 4 }, - { &MFVideoFormat_IMC1, 1, 2, 8 }, - { &MFVideoFormat_IMC1, 4, 3, 24 }, - { &MFVideoFormat_IMC1, 320, 240, 153600 }, - { &MFVideoFormat_IMC3, 1, 1, 4 }, - { &MFVideoFormat_IMC3, 2, 1, 4 }, - { &MFVideoFormat_IMC3, 1, 2, 8 }, - { &MFVideoFormat_IMC3, 4, 3, 24 }, - { &MFVideoFormat_IMC3, 320, 240, 153600 }, - { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, - { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, - { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, - { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC2, 4, 2, 12 }, - { &MFVideoFormat_IMC2, 320, 240, 115200 }, - { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, - { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, - { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, - { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC4, 4, 2, 12 }, - { &MFVideoFormat_IMC4, 320, 240, 115200 }, - { &MFVideoFormat_YV12, 1, 1, 3, 1 }, - { &MFVideoFormat_YV12, 2, 1, 3 }, - { &MFVideoFormat_YV12, 1, 2, 6, 3 }, - { &MFVideoFormat_YV12, 4, 3, 18 }, - { &MFVideoFormat_YV12, 320, 240, 115200 }, - - { &MFVideoFormat_I420, 1, 1, 3, 1 }, - { &MFVideoFormat_I420, 2, 1, 3 }, - { &MFVideoFormat_I420, 1, 2, 6, 3 }, - { &MFVideoFormat_I420, 4, 3, 18 }, - { &MFVideoFormat_I420, 320, 240, 115200 }, - - { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, - { &MFVideoFormat_IYUV, 2, 1, 3 }, - { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, - { &MFVideoFormat_IYUV, 4, 3, 18 }, - { &MFVideoFormat_IYUV, 320, 240, 115200 }, - - { &MFVideoFormat_YUY2, 2, 1, 4 }, - { &MFVideoFormat_YUY2, 4, 3, 24 }, - { &MFVideoFormat_YUY2, 128, 128, 32768 }, - { &MFVideoFormat_YUY2, 320, 240, 153600 }, - - { &MFVideoFormat_UYVY, 2, 1, 4 }, - { &MFVideoFormat_UYVY, 4, 3, 24 }, - { &MFVideoFormat_UYVY, 128, 128, 32768 }, - { &MFVideoFormat_UYVY, 320, 240, 153600 }, - }; +static void test_MFCalculateImageSize(void) +{ unsigned int i; UINT32 size; HRESULT hr; - if (!pMFGetPlaneSize) - win_skip("MFGetPlaneSize() is not available.\n"); - size = 1; hr = MFCalculateImageSize(&IID_IUnknown, 1, 1, &size); ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Vista */, "Unexpected hr %#x.\n", hr); @@ -4244,6 +4242,29 @@ static void test_MFCalculateImageSize(void) } } +static void test_MFGetPlaneSize(void) +{ + unsigned int i; + UINT32 size; + HRESULT hr; + + if (!pMFGetPlaneSize) + { + win_skip("MFGetPlaneSize() is not available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) + { + const struct image_size_test *ptr = &image_size_tests[i]; + unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; + + hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); + ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); + ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); + } +} + static void test_MFCompareFullToPartialMediaType(void) { IMFMediaType *full_type, *partial_type; @@ -7940,6 +7961,7 @@ START_TEST(mfplat) test_MFInvokeCallback(); test_stream_descriptor(); test_MFCalculateImageSize(); + test_MFGetPlaneSize(); test_MFCompareFullToPartialMediaType(); test_attributes_serialization(); test_wrapped_media_type(); -- 2.34.1

1 1

[PATCH 01/10] bcrypt: Create BCRYPT_KEY_BLOB struct definition.
by Santino Mazza Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- include/bcrypt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index 15c26c1fb0a..484dca0f0c4 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -254,6 +254,10 @@ typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO ULONG dwFlags; } BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO; +typedef struct _BCRYPT_KEY_BLOB { + ULONG Magic; +} BCRYPT_KEY_BLOB; + typedef struct _BCRYPT_ECCKEY_BLOB { ULONG dwMagic; -- 2.25.1

4 18

[PATCH] d3d1/tests: Fix the spelling of an ok() message.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b3691d91173..a425395e64a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5134,7 +5134,7 @@ static void test_create_target(BOOL d3d11) desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, ctx.surface, &desc, &rt); - ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpect hr %#lx, expected %#lx.\n", + ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#lx, expected %#lx.\n", i, hr, create_dpi_tests[i].hr); if (FAILED(hr)) -- 2.30.2

5 4

[PATCH] d3d11/tests: Fix the spelling of a couple of comments.
by Francois Gouget Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/d3d11/tests/d3d11.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 52c8816b689..236fa85a257 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5960,7 +5960,7 @@ static void test_pipeline_statistics_query(void) get_query_data(context, query, &data, sizeof(data)); /* WARP devices randomly return all-zeroed structures as if the draw did not happen. Flushing and - * sleeping a second before ending the query reduces the likelyhood of hitting the bug a lot, but + * sleeping a second before ending the query reduces the likelihood of hitting the bug a lot, but * does not eliminate it entirely. To make things work reliably ignore such broken results. */ if (is_warp_device(device) && !memcmp(&data, &zero_data, sizeof(data))) { @@ -7453,8 +7453,8 @@ static void test_device_context_state(void) * * The tests below suggest that a ContextState object stores its own state * for every device it is used with. This isn't entirely true, e.g. the - * primitive topology can be transfered between devices, but will cause odd - * refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 + * primitive topology can be transferred between devices, but will cause + * odd refcounting behavior afterwards (IAGetPrimitiveTopology will leak 54 * references on the context's device for example). */ if (0) { -- 2.30.2

2 1

[PATCH v2 1/4] wined3d: Allow up to 128 MiB of persistently mapped memory on 32-bit architectures.
by Zebediah Figura Feb. 14, 2022

Feb. 14, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Fix a typo in the subject line, and another copy-paste error as pointed out... This is a second version of [1]. I've reduced the cap to 128 MiB, which is enough for at least one and ideally two chunk buffers. If necessary it can probably be raised further in the future. I haven't done much testing personally—I'm trying to springboard off of others' testing, and also to get the code structure correct and upstream first and tune numbers later. This still uses the same crude scheme for determining what buffers to keep mapped. An LRU list, as proposed in a reply to [1], would be an obviously better scheme, although that perhaps is less true with the kind of chunk allocation that we do in practice. I haven't implemented that now because it's not nearly as trivial, and not clear enough that it would offer a performance improvement. Unlike [1], though, it should be easier to change the scheme with this patch, and with the subsequent patches for 32-bit map acceleration. [1] https://www.winehq.org/pipermail/wine-devel/2022-January/206187.html dlls/wined3d/adapter_vk.c | 24 +++++++++---- dlls/wined3d/context_gl.c | 61 ++++++++++++++++++++-------------- dlls/wined3d/context_vk.c | 20 ++++++++--- dlls/wined3d/directx.c | 9 +++++ dlls/wined3d/wined3d_private.h | 9 +++++ 5 files changed, 87 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index fdae15fe940..f09cd1b0fae 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -381,7 +381,10 @@ static void wined3d_allocator_vk_destroy_chunk(struct wined3d_allocator_chunk *c vk_info = &device_vk->vk_info; if (chunk_vk->c.map_ptr) + { VK_CALL(vkUnmapMemory(device_vk->vk_device, chunk_vk->vk_memory)); + adapter_adjust_mapped_memory(device_vk->d.adapter, -WINED3D_ALLOCATOR_CHUNK_SIZE); + } VK_CALL(vkFreeMemory(device_vk->vk_device, chunk_vk->vk_memory, NULL)); TRACE("Freed memory 0x%s.\n", wine_dbgstr_longlong(chunk_vk->vk_memory)); wined3d_allocator_chunk_cleanup(&chunk_vk->c); @@ -801,10 +804,15 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ return NULL; } } - else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->b.map_ptr))) < 0) + else { - ERR("Failed to map memory, vr %s.\n", wined3d_debug_vkresult(vr)); - return NULL; + if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->b.map_ptr))) < 0) + { + ERR("Failed to map memory, vr %s.\n", wined3d_debug_vkresult(vr)); + return NULL; + } + + adapter_adjust_mapped_memory(device_vk->d.adapter, bo->size); } return bo->b.map_ptr; @@ -812,12 +820,16 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context_vk *context_vk) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info; - struct wined3d_device_vk *device_vk; struct wined3d_bo_slab_vk *slab; - if (wined3d_map_persistent()) + /* This may race with the client thread, but it's not a hard limit anyway. */ + if (device_vk->d.adapter->mapped_size <= MAX_PERSISTENT_MAPPED_BYTES) + { + TRACE("Not unmapping BO %p.\n", bo); return; + } bo->b.map_ptr = NULL; @@ -834,8 +846,8 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context } vk_info = context_vk->vk_info; - device_vk = wined3d_device_vk(context_vk->c.device); VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); + adapter_adjust_mapped_memory(device_vk->d.adapter, -bo->size); } static void wined3d_bo_slab_vk_lock(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9153b7fd95f..a6e9d566eb3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2803,6 +2803,8 @@ static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *c ERR("Failed to map chunk memory.\n"); return NULL; } + + adapter_adjust_mapped_memory(context_gl->c.device->adapter, WINED3D_ALLOCATOR_CHUNK_SIZE); } ++chunk_gl->c.map_count; @@ -2817,12 +2819,14 @@ static void wined3d_allocator_chunk_gl_unmap(struct wined3d_allocator_chunk_gl * TRACE("chunk_gl %p, context_gl %p.\n", chunk_gl, context_gl); - if (!--chunk_gl->c.map_count && !wined3d_map_persistent()) - { - wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); - GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); - chunk_gl->c.map_ptr = NULL; - } + if (--chunk_gl->c.map_count) + return; + + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); + GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); + chunk_gl->c.map_ptr = NULL; + + adapter_adjust_mapped_memory(context_gl->c.device->adapter, -WINED3D_ALLOCATOR_CHUNK_SIZE); } static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl, uint32_t flags) @@ -2891,18 +2895,11 @@ map: * resources are mapped. On the other hand, we don't want to use the * access flags used to create the bo for non-persistent maps, because * that may imply dropping GL_MAP_UNSYNCHRONIZED_BIT. */ - if (wined3d_map_persistent()) - { - gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; - if (!(gl_flags & GL_MAP_READ_BIT)) - gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; - if (gl_flags & GL_MAP_WRITE_BIT) - gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; - } - else - { - gl_flags = wined3d_resource_gl_map_flags(bo, flags); - } + gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; + if (!(gl_flags & GL_MAP_READ_BIT)) + gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; + if (gl_flags & GL_MAP_WRITE_BIT) + gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; bo->b.map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)); @@ -2916,6 +2913,9 @@ map: bo->b.map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); } + if (bo->b.map_ptr) + adapter_adjust_mapped_memory(device_gl->d.adapter, bo->size); + wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Map buffer object"); @@ -2926,20 +2926,30 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - if (wined3d_map_persistent()) + if (context_gl->c.device->adapter->mapped_size <= MAX_PERSISTENT_MAPPED_BYTES) + { + TRACE("Not unmapping BO %p.\n", bo); return; + } + + if (bo->memory) + { + struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(bo->memory->chunk); + + wined3d_allocator_chunk_gl_unmap(chunk_gl, context_gl); + if (!chunk_gl->c.map_ptr) + bo->b.map_ptr = NULL; + return; + } bo->b.map_ptr = NULL; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - - if (bo->memory) - wined3d_allocator_chunk_gl_unmap(wined3d_allocator_chunk_gl(bo->memory->chunk), context_gl); - else - GL_EXTCALL(glUnmapBuffer(bo->binding)); - + GL_EXTCALL(glUnmapBuffer(bo->binding)); wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Unmap buffer object"); + + adapter_adjust_mapped_memory(context_gl->c.device->adapter, -bo->size); } void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, @@ -3104,6 +3114,7 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct { wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); GL_EXTCALL(glUnmapBuffer(bo->binding)); + adapter_adjust_mapped_memory(context_gl->c.device->adapter, -bo->size); } TRACE("Destroying GL buffer %u.\n", bo->id); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 1b5b177bb16..98610d65c5d 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -269,12 +269,17 @@ void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk wined3d_allocator_chunk_vk_lock(chunk_vk); - if (!chunk_vk->c.map_ptr && (vr = VK_CALL(vkMapMemory(device_vk->vk_device, - chunk_vk->vk_memory, 0, VK_WHOLE_SIZE, 0, &chunk_vk->c.map_ptr))) < 0) + if (!chunk_vk->c.map_ptr) { - ERR("Failed to map chunk memory, vr %s.\n", wined3d_debug_vkresult(vr)); - wined3d_allocator_chunk_vk_unlock(chunk_vk); - return NULL; + if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, + chunk_vk->vk_memory, 0, VK_WHOLE_SIZE, 0, &chunk_vk->c.map_ptr))) < 0) + { + ERR("Failed to map chunk memory, vr %s.\n", wined3d_debug_vkresult(vr)); + wined3d_allocator_chunk_vk_unlock(chunk_vk); + return NULL; + } + + adapter_adjust_mapped_memory(device_vk->d.adapter, WINED3D_ALLOCATOR_CHUNK_SIZE); } ++chunk_vk->c.map_count; @@ -305,6 +310,8 @@ void wined3d_allocator_chunk_vk_unmap(struct wined3d_allocator_chunk_vk *chunk_v chunk_vk->c.map_ptr = NULL; wined3d_allocator_chunk_vk_unlock(chunk_vk); + + adapter_adjust_mapped_memory(device_vk->d.adapter, -WINED3D_ALLOCATOR_CHUNK_SIZE); } VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk, @@ -1012,7 +1019,10 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const } if (bo->b.map_ptr) + { VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); + adapter_adjust_mapped_memory(device_vk->d.adapter, -bo->size); + } wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1b34d2eceaa..36ca1be5b79 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -157,6 +157,15 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) return adapter->vram_bytes_used; } +ssize_t adapter_adjust_mapped_memory(struct wined3d_adapter *adapter, ssize_t size) +{ + /* Note that this needs to be thread-safe; the Vulkan adapter may map from + * client threads. */ + ssize_t ret = InterlockedExchangeAddSizeT(&adapter->mapped_size, size) + size; + TRACE("Adjusted mapped adapter memory by %zd to %zd.\n", size, ret); + return ret; +} + void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { unsigned int output_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fef887071a9..dd0a49db3b5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3470,6 +3470,12 @@ struct wined3d_output HRESULT wined3d_output_get_gamma_ramp(struct wined3d_output *output, struct wined3d_gamma_ramp *ramp) DECLSPEC_HIDDEN; +#ifdef _WIN64 +#define MAX_PERSISTENT_MAPPED_BYTES SSIZE_MAX +#else +#define MAX_PERSISTENT_MAPPED_BYTES (128 * 1024 * 1024) +#endif + /* The adapter structure */ struct wined3d_adapter { @@ -3488,6 +3494,8 @@ struct wined3d_adapter void *formats; size_t format_size; + ssize_t mapped_size; + const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct wined3d_fragment_pipe_ops *fragment_pipe; const struct wined3d_state_entry_template *misc_state_template; @@ -3567,6 +3575,7 @@ BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter_vk *adapter_vk, const struct wined3d_vk_info *vk_info) DECLSPEC_HIDDEN; +ssize_t adapter_adjust_mapped_memory(struct wined3d_adapter *adapter, ssize_t size) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; -- 2.34.1

2 7