May 2021 - Wine-Devel - list.winehq.org

[PATCH] ntdll/tests: Clean up temp file.
by Daniel Lehman May 24, 2021

May 24, 2021

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- DeleteFile errors with sharing violation leaving files in %TEMP% --- dlls/ntdll/tests/om.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index fb7d48e7fe1..a7f8eaa84e1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1500,9 +1500,9 @@ static void test_query_object(void) GetTempFileNameA(tmp_path, "foo", 0, file1); handle = CreateFileA(file1, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0); test_object_type(handle, L"File"); - DeleteFileA( file1 ); test_file_info( handle ); pNtClose( handle ); + DeleteFileA( file1 ); status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, NULL, 0 ); ok( status == STATUS_SUCCESS, "NtCreateIoCompletion failed %x\n", status); -- 2.25.1

2 2

[PATCH 2/2] webservices: Properly initialize messages.
by Hans Leidekker May 24, 2021

May 24, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 6 ++- dlls/webservices/msg.c | 35 ++++++++-------- dlls/webservices/tests/msg.c | 79 +++++++++++++++++++++++++++++------- 3 files changed, 88 insertions(+), 32 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 0a1f1f3199b..9079d0a8cb1 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1687,7 +1687,6 @@ static HRESULT send_message( struct channel *channel, WS_MESSAGE *msg, const WS_ WS_WRITE_OPTION option, const void *body, ULONG size ) { HRESULT hr; - WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) return hr; if ((hr = message_set_action( msg, desc->action )) != S_OK) return hr; if ((hr = init_writer( channel )) != S_OK) return hr; @@ -1766,6 +1765,8 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS return WS_E_INVALID_OPERATION; } + WsInitializeMessage( msg, WS_BLANK_MESSAGE, NULL, NULL ); + if (!ctx) async_init( &async, &ctx_local ); hr = queue_send_message( channel, msg, desc, option, body, size, ctx ? ctx : &ctx_local ); if (!ctx) @@ -1810,6 +1811,7 @@ HRESULT WINAPI WsSendReplyMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS return WS_E_INVALID_OPERATION; } + WsInitializeMessage( msg, WS_REPLY_MESSAGE, NULL, NULL ); if ((hr = message_get_id( request, &id )) != S_OK) goto done; if ((hr = message_set_request_id( msg, &id )) != S_OK) goto done; @@ -2533,6 +2535,8 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS return WS_E_INVALID_OPERATION; } + WsInitializeMessage( request, WS_REQUEST_MESSAGE, NULL, NULL ); + if (!ctx) async_init( &async, &ctx_local ); hr = queue_request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, reply_desc, read_option, heap, value, size, ctx ? ctx : &ctx_local ); diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index d955e173b4f..51081217b7b 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -611,9 +611,9 @@ static HRESULT write_relatesto_header( WS_XML_WRITER *writer, const WS_XML_STRIN return WsWriteEndElement( writer, NULL ); /* </a:RelatesTo> */ } -static HRESULT write_headers( struct msg *msg, WS_XML_WRITER *writer, const WS_XML_STRING *prefix_env, - const WS_XML_STRING *ns_env, const WS_XML_STRING *prefix_addr, - const WS_XML_STRING *ns_addr ) +static HRESULT write_headers( struct msg *msg, WS_MESSAGE_INITIALIZATION init, WS_XML_WRITER *writer, + const WS_XML_STRING *prefix_env, const WS_XML_STRING *ns_env, + const WS_XML_STRING *prefix_addr, const WS_XML_STRING *ns_addr ) { static const WS_XML_STRING header = {6, (BYTE *)"Header"}; HRESULT hr; @@ -625,7 +625,7 @@ static HRESULT write_headers( struct msg *msg, WS_XML_WRITER *writer, const WS_X if ((hr = write_action_header( writer, prefix_env, ns_env, prefix_addr, ns_addr, msg->action )) != S_OK) return hr; - if (msg->init == WS_REPLY_MESSAGE) + if (init == WS_REPLY_MESSAGE) { if ((hr = write_relatesto_header( writer, prefix_env, ns_env, prefix_addr, ns_addr, &msg->id_req )) != S_OK) return hr; @@ -637,8 +637,9 @@ static HRESULT write_headers( struct msg *msg, WS_XML_WRITER *writer, const WS_X } else { - if ((hr = write_msgid_header( writer, prefix_env, ns_env, prefix_addr, ns_addr, &msg->id )) != S_OK) - return hr; + if (init == WS_REQUEST_MESSAGE && + (hr = write_msgid_header( writer, prefix_env, ns_env, prefix_addr, ns_addr, &msg->id )) != S_OK) return hr; + if (msg->version_addr == WS_ADDRESSING_VERSION_0_9 && (hr = write_replyto_header( writer, prefix_env, ns_env, prefix_addr, ns_addr )) != S_OK) return hr; } @@ -685,7 +686,7 @@ static HRESULT write_headers_transport( struct msg *msg, WS_XML_WRITER *writer, return hr; } -static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) +static HRESULT write_envelope_start( struct msg *msg, WS_MESSAGE_INITIALIZATION init, WS_XML_WRITER *writer ) { static const WS_XML_STRING envelope = {8, (BYTE *)"Envelope"}, body = {4, (BYTE *)"Body"}; static const WS_XML_STRING prefix_s = {1, (BYTE *)"s"}, prefix_a = {1, (BYTE *)"a"}; @@ -700,7 +701,7 @@ static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) if (msg->version_addr == WS_ADDRESSING_VERSION_TRANSPORT) hr = write_headers_transport( msg, writer, prefix_env, ns_env ); else - hr = write_headers( msg, writer, prefix_env, ns_env, prefix_addr, ns_addr ); + hr = write_headers( msg, init, writer, prefix_env, ns_env, prefix_addr, ns_addr ); if (hr != S_OK) return hr; return WsWriteStartElement( writer, prefix_env, &body, ns_env, NULL ); /* <s:Body> */ @@ -713,13 +714,13 @@ static HRESULT write_envelope_end( WS_XML_WRITER *writer ) return WsWriteEndElement( writer, NULL ); /* </s:Envelope> */ } -static HRESULT write_envelope( struct msg *msg ) +static HRESULT write_envelope( struct msg *msg, WS_MESSAGE_INITIALIZATION init ) { HRESULT hr; if (!msg->writer && (hr = WsCreateWriter( NULL, 0, &msg->writer, NULL )) != S_OK) return hr; if (!msg->buf && (hr = WsCreateXmlBuffer( msg->heap, NULL, 0, &msg->buf, NULL )) != S_OK) return hr; if ((hr = WsSetOutputToBuffer( msg->writer, msg->buf, NULL, 0, NULL )) != S_OK) return hr; - if ((hr = write_envelope_start( msg, msg->writer )) != S_OK) return hr; + if ((hr = write_envelope_start( msg, init, msg->writer )) != S_OK) return hr; return write_envelope_end( msg->writer ); } @@ -751,8 +752,8 @@ HRESULT WINAPI WsWriteEnvelopeStart( WS_MESSAGE *handle, WS_XML_WRITER *writer, } if (msg->state != WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; - else if ((hr = write_envelope( msg )) == S_OK && - (hr = write_envelope_start( msg, writer )) == S_OK) + else if ((hr = write_envelope( msg, msg->init )) == S_OK && + (hr = write_envelope_start( msg, msg->init, writer )) == S_OK) { msg->writer_body = writer; msg->state = WS_MESSAGE_STATE_WRITING; @@ -1085,7 +1086,7 @@ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATIO } if (msg->state >= WS_MESSAGE_STATE_INITIALIZED) hr = WS_E_INVALID_OPERATION; - else if ((hr = write_envelope( msg )) == S_OK) + else if ((hr = write_envelope( msg, init )) == S_OK) { msg->init = init; msg->state = WS_MESSAGE_STATE_INITIALIZED; @@ -1235,7 +1236,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val else free_header( msg->header[i] ); msg->header[i] = header; - hr = write_envelope( msg ); + hr = write_envelope( msg, msg->init ); done: LeaveCriticalSection( &msg->cs ); @@ -1353,7 +1354,7 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR break; } } - if (removed) hr = write_envelope( msg ); + if (removed) hr = write_envelope( msg, msg->init ); } LeaveCriticalSection( &msg->cs ); @@ -1730,7 +1731,7 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI if ((hr = build_custom_header( msg, desc->elementLocalName, desc->elementNs, desc->type, desc->typeDescription, option, value, size, &header )) != S_OK) goto done; msg->header[msg->header_count++] = header; - hr = write_envelope( msg ); + hr = write_envelope( msg, msg->init ); done: LeaveCriticalSection( &msg->cs ); @@ -1833,7 +1834,7 @@ HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *na i--; } } - if (removed) hr = write_envelope( msg ); + if (removed) hr = write_envelope( msg, msg->init ); } LeaveCriticalSection( &msg->cs ); diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index ed399db6364..5a5af55e5d8 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -164,6 +164,11 @@ static void test_WsCreateMessageForChannel(void) hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_EMPTY, "got %u\n", state ); + env_version = 0xdeadbeef; hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, sizeof(env_version), NULL ); @@ -393,6 +398,16 @@ static void test_WsWriteEnvelopeStart(void) "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" "</s:Header><s:Body/></s:Envelope>"; + static const char expected6[] = + "<s:Envelope xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header/><s:Body/></s:Envelope>"; + static const char expected7[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "</s:Header><s:Body/></s:Envelope>"; + static const char expected8[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Header/><s:Body/></s:Envelope>"; HRESULT hr; WS_MESSAGE *msg; WS_XML_WRITER *writer; @@ -407,8 +422,7 @@ static void test_WsWriteEnvelopeStart(void) hr = WsWriteEnvelopeStart( NULL, writer, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, - NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); @@ -429,8 +443,7 @@ static void test_WsWriteEnvelopeStart(void) ok( state == WS_MESSAGE_STATE_WRITING, "got %u\n", state ); WsFreeMessage( msg ); - hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, - NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -441,8 +454,7 @@ static void test_WsWriteEnvelopeStart(void) check_output_header( msg, expected3, -1, 0, 0, __LINE__ ); WsFreeMessage( msg ); - hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, - NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -453,8 +465,7 @@ static void test_WsWriteEnvelopeStart(void) check_output_header( msg, expected4, -1, 0, 0, __LINE__ ); WsFreeMessage( msg ); - hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, - NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -465,18 +476,48 @@ static void test_WsWriteEnvelopeStart(void) check_output_header( msg, expected5, -1, strstr(expected5, "urn:uuid:") - expected5, 46, __LINE__ ); WsFreeMessage( msg ); - hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, - NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected6, -1, 0, 0, __LINE__ ); WsFreeMessage( msg ); - hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, - NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected7, -1, strstr(expected7, "urn:uuid:") - expected7, 46, __LINE__ ); + WsFreeMessage( msg ); + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsInitializeMessage( msg, WS_BLANK_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected8, -1, 0, 0, __LINE__ ); + WsFreeMessage( msg ); + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_2, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeMessage( msg ); + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); - hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, - NULL ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_1_0, NULL, 0, &msg, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); WsFreeWriter( writer ); } @@ -1197,9 +1238,19 @@ static void test_WsResetMessage(void) hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_EMPTY, "got %u\n", state ); + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_INITIALIZED, "got %u\n", state ); + hr = WsResetMessage( msg, NULL ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.30.2

1 0

[PATCH 1/2] webservices: Buffer whole messages to be sent.
by Hans Leidekker May 24, 2021

May 24, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 132 +++++++++++++++++++++++++------------ 1 file changed, 89 insertions(+), 43 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index b894b0f61ba..0a1f1f3199b 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -234,6 +234,9 @@ struct channel char *read_buf; ULONG read_buflen; ULONG read_size; + char *send_buf; + ULONG send_buflen; + ULONG send_size; ULONG prop_count; struct prop prop[ARRAY_SIZE( channel_props )]; }; @@ -328,6 +331,7 @@ static void reset_channel( struct channel *channel ) clear_dict( &channel->dict_recv ); channel->msg = NULL; channel->read_size = 0; + channel->send_size = 0; switch (channel->binding) { @@ -386,6 +390,7 @@ static void free_channel( struct channel *channel ) WsFreeReader( channel->reader ); heap_free( channel->read_buf ); + heap_free( channel->send_buf ); free_props( channel ); channel->send_q.cs.DebugInfo->Spare[0] = 0; @@ -1262,26 +1267,44 @@ static HRESULT send_message_http( HINTERNET request, BYTE *data, ULONG len ) return S_OK; } -static HRESULT send_bytes( SOCKET socket, BYTE *bytes, int len ) +static ULONG get_max_buffer_size( struct channel *channel ) { - int count = send( socket, (char *)bytes, len, 0 ); - if (count < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); - if (count != len) return WS_E_OTHER; + ULONG size; + prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &size, sizeof(size) ); + return size; +} + +static HRESULT write_bytes( struct channel *channel, BYTE *bytes, ULONG len ) +{ + if (!channel->send_buf) + { + channel->send_buflen = get_max_buffer_size( channel ); + if (!(channel->send_buf = heap_alloc( channel->send_buflen ))) return E_OUTOFMEMORY; + } + if (channel->send_size + len >= channel->send_buflen) return WS_E_QUOTA_EXCEEDED; + + memcpy( channel->send_buf + channel->send_size, bytes, len ); + channel->send_size += len; return S_OK; } -static HRESULT send_size( SOCKET socket, ULONG size ) +static inline HRESULT write_byte( struct channel *channel, BYTE byte ) +{ + return write_bytes( channel, &byte, 1 ); +} + +static HRESULT write_size( struct channel *channel, ULONG size ) { HRESULT hr; - if (size < 0x80) return send_byte( socket, size ); - if ((hr = send_byte( socket, (size & 0x7f) | 0x80 )) != S_OK) return hr; - if ((size >>= 7) < 0x80) return send_byte( socket, size ); - if ((hr = send_byte( socket, (size & 0x7f) | 0x80 )) != S_OK) return hr; - if ((size >>= 7) < 0x80) return send_byte( socket, size ); - if ((hr = send_byte( socket, (size & 0x7f) | 0x80 )) != S_OK) return hr; - if ((size >>= 7) < 0x80) return send_byte( socket, size ); - if ((hr = send_byte( socket, (size & 0x7f) | 0x80 )) != S_OK) return hr; - if ((size >>= 7) < 0x08) return send_byte( socket, size ); + if (size < 0x80) return write_byte( channel, size ); + if ((hr = write_byte( channel, (size & 0x7f) | 0x80 )) != S_OK) return hr; + if ((size >>= 7) < 0x80) return write_byte( channel, size ); + if ((hr = write_byte( channel, (size & 0x7f) | 0x80 )) != S_OK) return hr; + if ((size >>= 7) < 0x80) return write_byte( channel, size ); + if ((hr = write_byte( channel, (size & 0x7f) | 0x80 )) != S_OK) return hr; + if ((size >>= 7) < 0x80) return write_byte( channel, size ); + if ((hr = write_byte( channel, (size & 0x7f) | 0x80 )) != S_OK) return hr; + if ((size >>= 7) < 0x08) return write_byte( channel, size ); return E_INVALIDARG; } @@ -1305,15 +1328,15 @@ static ULONG string_table_size( const struct dictionary *dict ) return size; } -static HRESULT send_string_table( SOCKET socket, const struct dictionary *dict ) +static HRESULT write_string_table( struct channel *channel, const struct dictionary *dict ) { ULONG i; HRESULT hr; for (i = 0; i < dict->dict.stringCount; i++) { if (dict->sequence[i] != dict->current_sequence) continue; - if ((hr = send_size( socket, dict->dict.strings[i].length )) != S_OK) return hr; - if ((hr = send_bytes( socket, dict->dict.strings[i].bytes, dict->dict.strings[i].length )) != S_OK) return hr; + if ((hr = write_size( channel, dict->dict.strings[i].length )) != S_OK) return hr; + if ((hr = write_bytes( channel, dict->dict.strings[i].bytes, dict->dict.strings[i].length )) != S_OK) return hr; } return S_OK; } @@ -1395,33 +1418,50 @@ static enum known_encoding map_channel_encoding( struct channel *channel ) #define FRAME_VERSION_MAJOR 1 #define FRAME_VERSION_MINOR 1 -static HRESULT send_preamble( struct channel *channel ) +static HRESULT write_preamble( struct channel *channel ) { unsigned char *url; HRESULT hr; int len; - if ((hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_VERSION )) != S_OK) return hr; - if ((hr = send_byte( channel->u.tcp.socket, FRAME_VERSION_MAJOR )) != S_OK) return hr; - if ((hr = send_byte( channel->u.tcp.socket, FRAME_VERSION_MINOR )) != S_OK) return hr; + if ((hr = write_byte( channel, FRAME_RECORD_TYPE_VERSION )) != S_OK) return hr; + if ((hr = write_byte( channel, FRAME_VERSION_MAJOR )) != S_OK) return hr; + if ((hr = write_byte( channel, FRAME_VERSION_MINOR )) != S_OK) return hr; - if ((hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_MODE )) != S_OK) return hr; - if ((hr = send_byte( channel->u.tcp.socket, map_channel_type(channel) )) != S_OK) return hr; + if ((hr = write_byte( channel, FRAME_RECORD_TYPE_MODE )) != S_OK) return hr; + if ((hr = write_byte( channel, map_channel_type(channel) )) != S_OK) return hr; - if ((hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_VIA )) != S_OK) return hr; + if ((hr = write_byte( channel, FRAME_RECORD_TYPE_VIA )) != S_OK) return hr; if ((hr = string_to_utf8( &channel->addr.url, &url, &len )) != S_OK) return hr; - if ((hr = send_size( channel->u.tcp.socket, len )) != S_OK) goto done; - if ((hr = send_bytes( channel->u.tcp.socket, url, len )) != S_OK) goto done; + if ((hr = write_size( channel, len )) != S_OK) goto done; + if ((hr = write_bytes( channel, url, len )) != S_OK) goto done; - if ((hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_KNOWN_ENCODING )) != S_OK) goto done; - if ((hr = send_byte( channel->u.tcp.socket, map_channel_encoding(channel) )) != S_OK) goto done; - hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_PREAMBLE_END ); + if ((hr = write_byte( channel, FRAME_RECORD_TYPE_KNOWN_ENCODING )) != S_OK) goto done; + if ((hr = write_byte( channel, map_channel_encoding(channel) )) != S_OK) goto done; + hr = write_byte( channel, FRAME_RECORD_TYPE_PREAMBLE_END ); done: heap_free( url ); return hr; } +static HRESULT send_bytes( SOCKET socket, char *bytes, int len ) +{ + int count = send( socket, bytes, len, 0 ); + if (count < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); + if (count != len) return WS_E_OTHER; + return S_OK; +} + +static HRESULT send_preamble( struct channel *channel ) +{ + HRESULT hr; + if ((hr = write_preamble( channel )) != S_OK) return hr; + if ((hr = send_bytes( channel->u.tcp.socket, channel->send_buf, channel->send_size )) != S_OK) return hr; + channel->send_size = 0; + return S_OK; +} + static HRESULT receive_bytes( struct channel *channel, unsigned char *bytes, int len ) { int count = recv( channel->u.tcp.socket, (char *)bytes, len, 0 ); @@ -1441,16 +1481,25 @@ static HRESULT receive_preamble_ack( struct channel *channel ) return S_OK; } -static HRESULT send_sized_envelope( struct channel *channel, BYTE *data, ULONG len ) +static HRESULT write_sized_envelope( struct channel *channel, BYTE *data, ULONG len ) { ULONG table_size = string_table_size( &channel->dict_send ); HRESULT hr; - if ((hr = send_byte( channel->u.tcp.socket, FRAME_RECORD_TYPE_SIZED_ENVELOPE )) != S_OK) return hr; - if ((hr = send_size( channel->u.tcp.socket, size_length(table_size) + table_size + len )) != S_OK) return hr; - if ((hr = send_size( channel->u.tcp.socket, table_size )) != S_OK) return hr; - if ((hr = send_string_table( channel->u.tcp.socket, &channel->dict_send )) != S_OK) return hr; - return send_bytes( channel->u.tcp.socket, data, len ); + if ((hr = write_byte( channel, FRAME_RECORD_TYPE_SIZED_ENVELOPE )) != S_OK) return hr; + if ((hr = write_size( channel, size_length(table_size) + table_size + len )) != S_OK) return hr; + if ((hr = write_size( channel, table_size )) != S_OK) return hr; + if ((hr = write_string_table( channel, &channel->dict_send )) != S_OK) return hr; + return write_bytes( channel, data, len ); +} + +static HRESULT send_sized_envelope( struct channel *channel, BYTE *data, ULONG len ) +{ + HRESULT hr; + if ((hr = write_sized_envelope( channel, data, len )) != S_OK) return hr; + if ((hr = send_bytes( channel->u.tcp.socket, channel->send_buf, channel->send_size )) != S_OK) return hr; + channel->send_size = 0; + return S_OK; } static HRESULT open_http_request( struct channel *channel, HINTERNET *req ) @@ -1880,17 +1929,14 @@ static HRESULT map_http_response_headers( struct channel *channel, WS_MESSAGE *m } #define INITIAL_READ_BUFFER_SIZE 4096 -static HRESULT receive_message_http( struct channel *channel, WS_MESSAGE *msg ) +static HRESULT receive_message_bytes_http( struct channel *channel, WS_MESSAGE *msg ) { DWORD len, bytes_read, offset = 0, size = INITIAL_READ_BUFFER_SIZE; - ULONG max_len; + ULONG max_len = get_max_buffer_size( channel ); HRESULT hr; if ((hr = map_http_response_headers( channel, msg )) != S_OK) return hr; - prop_get( channel->prop, channel->prop_count, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, - &max_len, sizeof(max_len) ); - if ((hr = resize_read_buffer( channel, size )) != S_OK) return hr; channel->read_size = 0; for (;;) @@ -2162,7 +2208,7 @@ static HRESULT send_preamble_ack( struct channel *channel ) return S_OK; } -static HRESULT receive_message_session( struct channel *channel ) +static HRESULT receive_message_bytes_session( struct channel *channel ) { HRESULT hr; @@ -2184,7 +2230,7 @@ static HRESULT receive_message_bytes( struct channel *channel, WS_MESSAGE *msg ) switch (channel->binding) { case WS_HTTP_CHANNEL_BINDING: - return receive_message_http( channel, msg ); + return receive_message_bytes_http( channel, msg ); case WS_TCP_CHANNEL_BINDING: if (channel->type & WS_CHANNEL_TYPE_SESSION) @@ -2198,7 +2244,7 @@ static HRESULT receive_message_bytes( struct channel *channel, WS_MESSAGE *msg ) /* fall through */ case SESSION_STATE_SETUP_COMPLETE: - return receive_message_session( channel ); + return receive_message_bytes_session( channel ); default: ERR( "unhandled session state %u\n", channel->session_state ); -- 2.30.2

1 0

[PATCH v2 1/4] server: Check for system regs before suspending for ptrace.
by Paul Gofman May 24, 2021

May 24, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - no changes. server/ptrace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 3621e8d82ad..b2d23d89aaf 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -571,15 +571,15 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); - if (!suspend_for_ptrace( thread )) return; - if (!(thread->system_regs & SERVER_CTX_DEBUG_REGISTERS)) { /* caller has initialized everything to 0 already, just return */ context->flags |= SERVER_CTX_DEBUG_REGISTERS; - goto done; + return; } + if (!suspend_for_ptrace( thread )) return; + for (i = 0; i < 8; i++) { if (i == 4 || i == 5) continue; -- 2.31.1

2 4

[PATCH 1/3] server: Check for system regs before suspending for ptrace.
by Paul Gofman May 24, 2021

May 24, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- server/ptrace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 3621e8d82ad..b2d23d89aaf 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -571,15 +571,15 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); - if (!suspend_for_ptrace( thread )) return; - if (!(thread->system_regs & SERVER_CTX_DEBUG_REGISTERS)) { /* caller has initialized everything to 0 already, just return */ context->flags |= SERVER_CTX_DEBUG_REGISTERS; - goto done; + return; } + if (!suspend_for_ptrace( thread )) return; + for (i = 0; i < 8; i++) { if (i == 4 || i == 5) continue; -- 2.31.1

2 3

[PATCH v2] gdi32: Match second_name during font search.
by Jiangyi Chen May 24, 2021

May 24, 2021

2 1

[PATCH] gdi32: Avoid the registry key is not deleted when face's full name matches but the file path does not match.
by Jiangyi Chen May 24, 2021

May 24, 2021

2 1

[PATCH] gdi32: Delete the external font reg key when face's name matches but the file path does not.
by Huw Davies May 24, 2021

May 24, 2021

From: Jiangyi Chen <cjy520lcy(a)163.com> Signed-off-by: Jiangyi Chen <chenjiangyi(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2d2831ec725..49775b7a806 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -7881,9 +7881,9 @@ static void update_external_font_keys(void) { if (type != REG_SZ) goto next; if ((tmp = wcsrchr( value, ' ' )) && !facename_compare( tmp, L" (TrueType)", -1 )) *tmp = 0; - if ((face = find_face_from_full_name( value ))) + if ((face = find_face_from_full_name( value )) && !wcsicmp( face->file, path )) { - if (!wcsicmp( face->file, path )) face->flags |= ADDFONT_EXTERNAL_FOUND; + face->flags |= ADDFONT_EXTERNAL_FOUND; goto next; } if (tmp && !*tmp) *tmp = ' '; -- 2.23.0

1 0

[PATCH 1/7] quartz/tests: Test that IMediaPosition is also checked when renderers are counted.
by Anton Baskanov May 24, 2021

May 24, 2021

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 165 +++++++++++++++++++++++++++++++- 1 file changed, 161 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index c663b5d8a99..7f3372e2acf 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -848,6 +848,7 @@ struct testfilter ULONG misc_flags; IMediaSeeking IMediaSeeking_iface; + IMediaPosition IMediaPosition_iface; LONG seeking_ref; DWORD seek_caps; BOOL support_testguid, support_media_time; @@ -1315,6 +1316,10 @@ static HRESULT WINAPI testfilter_QueryInterface(IBaseFilter *iface, REFIID iid, { *out = &filter->IMediaSeeking_iface; } + else if (IsEqualGUID(iid, &IID_IMediaPosition) && filter->IMediaPosition_iface.lpVtbl) + { + *out = &filter->IMediaPosition_iface; + } else if (IsEqualGUID(iid, &IID_IReferenceClock) && filter->IReferenceClock_iface.lpVtbl) { *out = &filter->IReferenceClock_iface; @@ -1610,7 +1615,7 @@ static HRESULT WINAPI testseek_QueryPreferredFormat(IMediaSeeking *iface, GUID * static HRESULT WINAPI testseek_GetTimeFormat(IMediaSeeking *iface, GUID *format) { - ok(0, "Unexpected call.\n"); + if (winetest_debug > 1) trace("%p->GetTimeFormat()\n", iface); return E_NOTIMPL; } @@ -1733,6 +1738,141 @@ static const IMediaSeekingVtbl testseek_vtbl = testseek_GetPreroll, }; +static struct testfilter *impl_from_IMediaPosition(IMediaPosition *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, IMediaPosition_iface); +} + +static HRESULT WINAPI testpos_QueryInterface(IMediaPosition *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_IMediaPosition(iface); + return IBaseFilter_QueryInterface(&filter->IBaseFilter_iface, iid, out); +} + +static ULONG WINAPI testpos_AddRef(IMediaPosition *iface) +{ + struct testfilter *filter = impl_from_IMediaPosition(iface); + return IBaseFilter_AddRef(&filter->IBaseFilter_iface); +} + +static ULONG WINAPI testpos_Release(IMediaPosition *iface) +{ + struct testfilter *filter = impl_from_IMediaPosition(iface); + return IBaseFilter_Release(&filter->IBaseFilter_iface); +} + +static HRESULT WINAPI testpos_GetTypeInfoCount(IMediaPosition *iface, UINT *count) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_GetTypeInfo(IMediaPosition *iface, UINT index, LCID lcid, ITypeInfo **typeinfo) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_GetIDsOfNames(IMediaPosition *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_Invoke(IMediaPosition *iface, DISPID id, REFIID iid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_get_Duration(IMediaPosition *iface, REFTIME *length) +{ + if (winetest_debug > 1) trace("%p->get_Duration()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_put_CurrentPosition(IMediaPosition *iface, REFTIME time) +{ + if (winetest_debug > 1) trace("%p->put_CurrentPosition(%f)\n", iface, time); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_get_CurrentPosition(IMediaPosition *iface, REFTIME *time) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_get_StopTime(IMediaPosition *iface, REFTIME *time) +{ + if (winetest_debug > 1) trace("%p->get_StopTime()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_put_StopTime(IMediaPosition *iface, REFTIME time) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_get_PrerollTime(IMediaPosition *iface, REFTIME *time) +{ + if (winetest_debug > 1) trace("%p->get_PrerollTime()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_put_PrerollTime(IMediaPosition *iface, REFTIME time) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_put_Rate(IMediaPosition *iface, double rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_get_Rate(IMediaPosition *iface, double *rate) +{ + if (winetest_debug > 1) trace("%p->get_Rate()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_CanSeekForward(IMediaPosition *iface, LONG *can_seek_forward) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testpos_CanSeekBackward(IMediaPosition *iface, LONG *can_seek_backward) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IMediaPositionVtbl testpos_vtbl = +{ + testpos_QueryInterface, + testpos_AddRef, + testpos_Release, + testpos_GetTypeInfoCount, + testpos_GetTypeInfo, + testpos_GetIDsOfNames, + testpos_Invoke, + testpos_get_Duration, + testpos_put_CurrentPosition, + testpos_get_CurrentPosition, + testpos_get_StopTime, + testpos_put_StopTime, + testpos_get_PrerollTime, + testpos_put_PrerollTime, + testpos_put_Rate, + testpos_get_Rate, + testpos_CanSeekForward, + testpos_CanSeekBackward, +}; + static struct testfilter *impl_from_IReferenceClock(IReferenceClock *iface) { return CONTAINING_RECORD(iface, struct testfilter, IReferenceClock_iface); @@ -3964,9 +4104,9 @@ static void test_ec_complete(void) ok(hr == S_OK, "Got hr %#x.\n", hr); /* A filter counts as a renderer if it (1) exposes IAMFilterMiscFlags and - * reports itself as a renderer, or (2) exposes IMediaSeeking and has no - * output pins. Despite MSDN, QueryInternalConnections() does not seem to - * be used. */ + * reports itself as a renderer, or (2) exposes IMediaSeeking or + * IMediaPosition and has no output pins. Despite MSDN, + * QueryInternalConnections() does not seem to be used. */ IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); @@ -4010,7 +4150,16 @@ static void test_ec_complete(void) ok(filter1.seeking_ref == 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + filter1.IMediaPosition_iface.lpVtbl = &testpos_vtbl; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + + hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter1.IMediaPosition_iface.lpVtbl = NULL; filter1_pin.dir = PINDIR_INPUT; filter1.pin_count = 1; filter1_pin.QueryInternalConnections_hr = S_OK; @@ -4019,6 +4168,14 @@ static void test_ec_complete(void) hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); ok(hr == E_ABORT, "Got hr %#x.\n", hr); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + + filter1.IMediaPosition_iface.lpVtbl = &testpos_vtbl; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + + hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaControl_Release(control); IMediaEvent_Release(eventsrc); IMediaEventSink_Release(eventsink); -- 2.25.1

2 12

[PATCH 6/6] winex11.drv: Add a cache for querying XRandR 1.4 current modes.
by Zhiyi Zhang May 24, 2021

May 24, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51047 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 124 ++++++++++++++++++++++++++++++++------ 1 file changed, 106 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fa748c2af04..c3af35d8ec3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -324,6 +324,32 @@ static LONG xrandr10_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) #ifdef HAVE_XRRGETPROVIDERRESOURCES +static struct current_mode +{ + ULONG_PTR id; + BOOL loaded; + DEVMODEW mode; +} *current_modes; +static int current_mode_count; + +static CRITICAL_SECTION current_modes_section; +static CRITICAL_SECTION_DEBUG current_modes_critsect_debug = +{ + 0, 0, &current_modes_section, + {&current_modes_critsect_debug.ProcessLocksList, &current_modes_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": current_modes_section")} +}; +static CRITICAL_SECTION current_modes_section = {&current_modes_critsect_debug, -1, 0, 0, 0, 0}; + +static void xrandr14_invalidate_current_mode_cache(void) +{ + EnterCriticalSection( &current_modes_section ); + heap_free( current_modes); + current_modes = NULL; + current_mode_count = 0; + LeaveCriticalSection( &current_modes_section ); +} + static XRRScreenResources *xrandr_get_screen_resources(void) { XRRScreenResources *resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ); @@ -1115,6 +1141,7 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { + xrandr14_invalidate_current_mode_cache(); if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) { /* Don't send a WM_DISPLAYCHANGE message here because this event may be a result from @@ -1148,7 +1175,8 @@ static void xrandr14_register_event_handlers(void) /* XRandR 1.4 display settings handler */ static BOOL xrandr14_get_id( const WCHAR *device_name, ULONG_PTR *id ) { - INT gpu_count, adapter_count, display_count = 0; + struct current_mode *tmp_modes, *new_current_modes = NULL; + INT gpu_count, adapter_count, new_current_mode_count = 0; INT gpu_idx, adapter_idx, display_idx; struct x11drv_adapter *adapters; struct x11drv_gpu *gpus; @@ -1159,31 +1187,60 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, ULONG_PTR *id ) if (*end) return FALSE; - if (!xrandr14_get_gpus2( &gpus, &gpu_count, FALSE )) - return FALSE; - - for (gpu_idx = 0; gpu_idx < gpu_count; ++gpu_idx) + /* Update cache */ + EnterCriticalSection( &current_modes_section ); + if (!current_modes) { - if (!xrandr14_get_adapters( gpus[gpu_idx].id, &adapters, &adapter_count )) + if (!xrandr14_get_gpus2( &gpus, &gpu_count, FALSE )) { - xrandr14_free_gpus( gpus ); + LeaveCriticalSection( &current_modes_section ); return FALSE; } - adapter_idx = display_idx - display_count; - if (adapter_idx < adapter_count) + for (gpu_idx = 0; gpu_idx < gpu_count; ++gpu_idx) { - *id = adapters[adapter_idx].id; - xrandr14_free_adapters( adapters ); - xrandr14_free_gpus( gpus ); - return TRUE; - } + if (!xrandr14_get_adapters( gpus[gpu_idx].id, &adapters, &adapter_count )) + break; - display_count += adapter_count; - xrandr14_free_adapters( adapters ); + if (!new_current_modes) + tmp_modes = heap_alloc( adapter_count * sizeof(*tmp_modes) ); + else + tmp_modes = heap_realloc( new_current_modes, (new_current_mode_count + adapter_count) * sizeof(*tmp_modes) ); + + if (!tmp_modes) + { + xrandr14_free_adapters( adapters ); + break; + } + new_current_modes = tmp_modes; + + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + new_current_modes[new_current_mode_count + adapter_idx].id = adapters[adapter_idx].id; + new_current_modes[new_current_mode_count + adapter_idx].loaded = FALSE; + } + new_current_mode_count += adapter_count; + xrandr14_free_adapters( adapters ); + } + xrandr14_free_gpus( gpus ); + + if (new_current_modes) + { + heap_free( current_modes ); + current_modes = new_current_modes; + current_mode_count = new_current_mode_count; + } } - xrandr14_free_gpus( gpus ); - return FALSE; + + if (display_idx >= current_mode_count) + { + LeaveCriticalSection( &current_modes_section ); + return FALSE; + } + + *id = current_modes[display_idx].id; + LeaveCriticalSection( &current_modes_section ); + return TRUE; } static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, DWORD frequency, @@ -1342,6 +1399,21 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) RECT primary; INT mode_idx; + EnterCriticalSection( &current_modes_section ); + for (mode_idx = 0; mode_idx < current_mode_count; ++mode_idx) + { + if (current_modes[mode_idx].id != id) + continue; + + if (!current_modes[mode_idx].loaded) + break; + + memcpy( mode, &current_modes[mode_idx].mode, sizeof(*mode) ); + LeaveCriticalSection( &current_modes_section ); + return TRUE; + } + LeaveCriticalSection( &current_modes_section ); + screen_resources = xrandr_get_screen_resources(); if (!screen_resources) goto done; @@ -1400,6 +1472,21 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) mode->u1.s2.dmPosition.x = crtc_info->x - primary.left; mode->u1.s2.dmPosition.y = crtc_info->y - primary.top; ret = TRUE; + + EnterCriticalSection( &current_modes_section ); + for (mode_idx = 0; mode_idx < current_mode_count; ++mode_idx) + { + if (current_modes[mode_idx].id != id) + continue; + + memcpy( &current_modes[mode_idx].mode, mode, sizeof(*mode) ); + current_modes[mode_idx].mode.dmSize = sizeof(*mode); + current_modes[mode_idx].mode.dmDriverExtra = 0; + current_modes[mode_idx].loaded = TRUE; + break; + } + LeaveCriticalSection( &current_modes_section ); + done: if (crtc_info) pXRRFreeCrtcInfo( crtc_info ); @@ -1517,6 +1604,7 @@ done: if (output_info) pXRRFreeOutputInfo( output_info ); pXRRFreeScreenResources( screen_resources ); + xrandr14_invalidate_current_mode_cache(); return ret; } -- 2.30.2

2 2