wine-commits August 2022

wine-commits@winehq.org

1 participants
596 discussions

Rémi Bernon : gitlab: Move build steps to the build-all script.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: f1a7a16b83e1296457ed509ae0607e1c8cb2fb71 URL: https://gitlab.winehq.org/wine/wine/-/commit/f1a7a16b83e1296457ed509ae0607e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 4 19:31:21 2022 +0200 gitlab: Move build steps to the build-all script. --- tools/gitlab/build-all | 22 ++++++++++++++++++++++ tools/gitlab/build.yml | 10 +--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/tools/gitlab/build-all b/tools/gitlab/build-all new file mode 100755 index 00000000000..351e100b4f8 --- /dev/null +++ b/tools/gitlab/build-all @@ -0,0 +1,22 @@ +#!/bin/bash + +echo "Building $(git log -1)" +echo "---" + +set -Eeuxo pipefail + +./tools/make_requests +./tools/make_makefiles +autoreconf + +cd build64 +../configure -C --enable-win64 --enable-werror --with-mingw +make -s -j$(nproc) +cd .. + +cd build32 +../configure -C --enable-werror --with-mingw +make -s -j$(nproc) +cd .. + +git reset --hard diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 4f1ff0eddc5..1cb674d837a 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -30,15 +30,7 @@ build-all: - build64/config.log - build32/config.log script: - - ./tools/make_requests - - ./tools/make_makefiles - - autoreconf - - cd build64 - - ../configure -C --enable-win64 --enable-werror --with-mingw - - make -s -j$(nproc) - - cd ../build32 - - ../configure -C --enable-werror --with-mingw - - make -s -j$(nproc) + - ./tools/gitlab/build-all build-winetest: extends: .wine-build

1 0

Alistair Leslie-Hughes : include: Add coclass SpMMAudioEnum.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 6a09b45a01ff971c30b7118ea7f62032a9567990 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a09b45a01ff971c30b7118ea7f620… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 5 18:00:46 2022 +1000 include: Add coclass SpMMAudioEnum. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapi.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index ba577d4de04..cd5d6044bdf 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -1295,6 +1295,16 @@ library SpeechLib [default] interface ISpeechFileStream; }; + [ + uuid(ab1890a0-e91f-11d2-bb91-00c04f8ee6c0), + restricted, + hidden + ] + coclass SpMMAudioEnum + { + interface IEnumSpObjectTokens; + }; + [ uuid(cf3d2e50-53f2-11d2-960c-00c04f8ee628) ]

1 0

Alistair Leslie-Hughes : sapi: Add AudioInput registry key.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 48b115ebdefe1218eddc43f0665647e11e65a839 URL: https://gitlab.winehq.org/wine/wine/-/commit/48b115ebdefe1218eddc43f0665647… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 5 17:31:47 2022 +1000 sapi: Add AudioInput registry key. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/sapi/sapi.rgs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/sapi/sapi.rgs b/dlls/sapi/sapi.rgs index 331e115ae71..bf784fd58d6 100644 --- a/dlls/sapi/sapi.rgs +++ b/dlls/sapi/sapi.rgs @@ -6,6 +6,17 @@ HKLM { NoRemove Speech { + NoRemove AudioInput + { + val DefaultDefaultTokenId = s 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Speech\AudioInput\TokenEnums\MMAudioIn\' + NoRemove TokenEnums + { + NoRemove MMAudioIn + { + val CLSID = s '{AB1890A0-E91F-11D2-BB91-00C04F8EE6C0}' + } + } + } NoRemove AudioOutput { val DefaultDefaultTokenId = s 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Speech\AudioOutput\TokenEnums\MMAudioOut\'

1 0

Shaun Ren : webservices: Add support for receiving fault messages.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 21c28028085948dc8ccaff6a88c970eb39502a03 URL: https://gitlab.winehq.org/wine/wine/-/commit/21c28028085948dc8ccaff6a88c970… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Aug 3 19:25:53 2022 -0400 webservices: Add support for receiving fault messages. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/channel.c | 30 ++++++----- dlls/webservices/msg.c | 41 +++++++++++++++ dlls/webservices/proxy.c | 12 ++--- dlls/webservices/tests/proxy.c | 96 ++++++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 1 + 5 files changed, 161 insertions(+), 19 deletions(-)

1 0

Shaun Ren : webservices: Address the request message in WsCall.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: a5359f36abef28646979849664207e3a7c5d6bf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5359f36abef28646979849664207e… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Aug 3 19:32:58 2022 -0400 webservices: Address the request message in WsCall. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/channel.c | 6 ++++++ dlls/webservices/proxy.c | 1 + dlls/webservices/webservices_private.h | 1 + 3 files changed, 8 insertions(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 4c9f9c4ccff..968110d56bd 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -3041,3 +3041,9 @@ HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE LeaveCriticalSection( &channel->cs ); return hr; } + +HRESULT channel_address_message( WS_CHANNEL *handle, WS_MESSAGE *msg ) +{ + struct channel *channel = (struct channel *)handle; + return WsAddressMessage( msg, &channel->addr, NULL ); +} diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 09f6e2bee00..3a8baade8dd 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -426,6 +426,7 @@ static HRESULT send_message( WS_CHANNEL *channel, WS_MESSAGE *msg, WS_MESSAGE_DE WS_XML_WRITER *writer; HRESULT hr; + if ((hr = channel_address_message( channel, msg )) != S_OK) return hr; if ((hr = message_set_action( msg, desc->action )) != S_OK) return hr; if ((hr = WsCreateWriter( NULL, 0, &writer, NULL )) != S_OK) return hr; if ((hr = set_output( writer )) != S_OK) goto done; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index d7f62c3d8a6..a2f89d47d7a 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -168,6 +168,7 @@ HRESULT message_map_http_response_headers( WS_MESSAGE *, HINTERNET, const WS_HTT HRESULT channel_send_message( WS_CHANNEL *, WS_MESSAGE * ) DECLSPEC_HIDDEN; HRESULT channel_receive_message( WS_CHANNEL *, WS_MESSAGE * ) DECLSPEC_HIDDEN; HRESULT channel_get_reader( WS_CHANNEL *, WS_XML_READER ** ) DECLSPEC_HIDDEN; +HRESULT channel_address_message( WS_CHANNEL *, WS_MESSAGE * ) DECLSPEC_HIDDEN; HRESULT parse_url( const WS_STRING *, WS_URL_SCHEME_TYPE *, WCHAR **, USHORT * ) DECLSPEC_HIDDEN;

1 0

Shaun Ren : webservices/tests: Add a fault reading test for WsReadBody.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: e4ff5f1ef8700aea563dc083ea3e08a845697507 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4ff5f1ef8700aea563dc083ea3e08… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Aug 3 19:22:25 2022 -0400 webservices/tests: Add a fault reading test for WsReadBody. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/tests/msg.c | 47 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index feeedc940d5..b1c0237dc3f 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -1202,19 +1202,27 @@ static void test_WsReadBody(void) static const char xml[] = "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" "<u xmlns=\"ns\"><val>1</val></u></s:Body></s:Envelope>"; + static const char faultxml[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" + "<s:Fault><faultcode>s:Client</faultcode><faultstring>OLS Exception</faultstring></s:Fault>" + "</s:Body></s:Envelope>"; + static const WS_XML_STRING faultcode = { 6, (BYTE *)"Client" }; + static const WS_STRING faultstring = { 13, (WCHAR *)L"OLS Exception" }; WS_HEAP *heap; - WS_MESSAGE *msg, *msg2; + WS_MESSAGE *msg, *msg2, *msg3; WS_XML_READER *reader; WS_MESSAGE_STATE state; + BOOL isfault; WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"u"}; WS_XML_STRING val = {3, (BYTE *)"val"}, ns = {2, (BYTE *)"ns"}; - WS_ELEMENT_DESCRIPTION desc; + WS_ELEMENT_DESCRIPTION desc, faultdesc; WS_STRUCT_DESCRIPTION s; WS_FIELD_DESCRIPTION f, *fields[1]; struct test { UINT32 val; } test; + WS_FAULT fault; HRESULT hr; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); @@ -1280,8 +1288,43 @@ static void test_WsReadBody(void) hr = WsReadEnvelopeEnd( msg2, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg3, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = set_input( reader, faultxml, strlen(faultxml) ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = WsReadEnvelopeStart( msg3, reader, NULL, NULL, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + isfault = FALSE; + hr = WsGetMessageProperty( msg3, WS_MESSAGE_PROPERTY_IS_FAULT, &isfault, sizeof(isfault), NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( isfault, "isfault == FALSE\n" ); + + faultdesc.elementLocalName = NULL; + faultdesc.elementNs = NULL; + faultdesc.type = WS_FAULT_TYPE; + faultdesc.typeDescription = NULL; + + memset( &fault, 0, sizeof(fault) ); + hr = WsReadBody( msg3, &faultdesc, WS_READ_REQUIRED_VALUE, heap, &fault, sizeof(fault), NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( fault.code->value.localName.length == faultcode.length, "got %lu\n", fault.code->value.localName.length ); + ok( !memcmp( fault.code->value.localName.bytes, faultcode.bytes, faultcode.length ), "wrong fault code\n" ); + ok( !fault.code->subCode, "subcode is not NULL\n" ); + ok( fault.reasonCount == 1, "got %lu\n", fault.reasonCount ); + ok( fault.reasons[0].text.length == faultstring.length, "got %lu\n", fault.reasons[0].text.length ); + ok( !memcmp( fault.reasons[0].text.chars, faultstring.chars, faultstring.length * sizeof(WCHAR) ), + "wrong fault string\n" ); + + hr = WsReadEnvelopeEnd( msg3, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + WsFreeMessage( msg ); WsFreeMessage( msg2 ); + WsFreeMessage( msg3 ); WsFreeReader( reader ); WsFreeHeap( heap ); }

1 0

Shaun Ren : webservices: Fill in type description for WS_FAULT_TYPE if necessary in WsReadBody.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: d8f230f219c7dcff3e873b7188377b73dc6b52b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8f230f219c7dcff3e873b7188377b… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Aug 3 19:19:53 2022 -0400 webservices: Fill in type description for WS_FAULT_TYPE if necessary in WsReadBody. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/msg.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index e4d4fce8ce4..36dbe564b85 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1042,6 +1042,8 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des WS_HEAP *heap, void *value, ULONG size, WS_ERROR *error ) { struct msg *msg = (struct msg *)handle; + WS_ELEMENT_DESCRIPTION tmp; + WS_FAULT_DESCRIPTION fault_desc; HRESULT hr; TRACE( "%p %p %u %p %p %lu %p\n", handle, desc, option, heap, value, size, error ); @@ -1058,7 +1060,23 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des } if (msg->state != WS_MESSAGE_STATE_READING) hr = WS_E_INVALID_OPERATION; - else hr = WsReadElement( msg->reader_body, desc, option, heap, value, size, NULL ); + else + { + if (!desc->typeDescription) + { + if (desc->type == WS_FAULT_TYPE) + { + memcpy( &tmp, desc, sizeof(*desc) ); + fault_desc.envelopeVersion = msg->version_env; + tmp.typeDescription = &fault_desc; + desc = &tmp; + } + else if (desc->type == WS_ENDPOINT_ADDRESS_TYPE) + FIXME( "!desc->typeDescription with WS_ENDPOINT_ADDRESS_TYPE\n" ); + } + + hr = WsReadElement( msg->reader_body, desc, option, heap, value, size, NULL ); + } LeaveCriticalSection( &msg->cs ); TRACE( "returning %#lx\n", hr );

1 0

Shaun Ren : webservices: Detect when a message contains a fault in read_envelope_start.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: dfd6cb97682aaa981fb978271b3c01a2e3035d24 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfd6cb97682aaa981fb978271b3c01… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Aug 3 19:16:35 2022 -0400 webservices: Detect when a message contains a fault in read_envelope_start. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/msg.c | 34 +++++++++++++++++++++++++++++++++- dlls/webservices/tests/msg.c | 21 ++++++++++++++++++++- include/webservices.h | 15 +++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 98d43660957..e4d4fce8ce4 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -42,6 +42,10 @@ static const struct prop_desc msg_props[] = { sizeof(WS_XML_READER *), TRUE }, /* WS_MESSAGE_PROPERTY_BODY_READER */ { sizeof(WS_XML_WRITER *), TRUE }, /* WS_MESSAGE_PROPERTY_BODY_WRITER */ { sizeof(BOOL), TRUE }, /* WS_MESSAGE_PROPERTY_IS_ADDRESSED */ + { sizeof(WS_HEAP_PROPERTIES), TRUE }, /* WS_MESSAGE_PROPERTY_HEAP_PROPERTIES */ + { sizeof(WS_XML_READER_PROPERTIES), TRUE }, /* WS_MESSAGE_PROPERTY_XML_READER_PROPERTIES */ + { sizeof(WS_XML_WRITER_PROPERTIES), TRUE }, /* WS_MESSAGE_PROPERTY_XML_WRITER_PROPERTIES */ + { sizeof(BOOL), FALSE }, /* WS_MESSAGE_PROPERTY_IS_FAULT */ }; struct header @@ -122,6 +126,7 @@ static void free_header( struct header *header ) static void reset_msg( struct msg *msg ) { + BOOL isfault = FALSE; ULONG i; msg->state = WS_MESSAGE_STATE_EMPTY; @@ -150,6 +155,8 @@ static void reset_msg( struct msg *msg ) memset( &msg->ctx_send, 0, sizeof(msg->ctx_send) ); memset( &msg->ctx_receive, 0, sizeof(msg->ctx_receive) ); + + prop_set( msg->prop, msg->prop_count, WS_MESSAGE_PROPERTY_IS_FAULT, &isfault, sizeof(isfault) ); } static void free_msg( struct msg *msg ) @@ -375,6 +382,13 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID else *(BOOL *)buf = msg->is_addressed; break; + case WS_MESSAGE_PROPERTY_HEAP_PROPERTIES: + case WS_MESSAGE_PROPERTY_XML_READER_PROPERTIES: + case WS_MESSAGE_PROPERTY_XML_WRITER_PROPERTIES: + FIXME( "property %u not supported\n", id ); + hr = E_NOTIMPL; + break; + default: hr = prop_get( msg->prop, msg->prop_count, id, buf, size ); } @@ -877,6 +891,18 @@ static BOOL match_current_element( WS_XML_READER *reader, const WS_XML_STRING *l return WsXmlStringEquals( elem->localName, localname, NULL ) == S_OK; } +static BOOL match_current_element_with_ns( WS_XML_READER *reader, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) +{ + const WS_XML_NODE *node; + const WS_XML_ELEMENT_NODE *elem; + + if (WsGetReaderNode( reader, &node, NULL ) != S_OK) return FALSE; + if (node->nodeType != WS_XML_NODE_TYPE_ELEMENT) return FALSE; + elem = (const WS_XML_ELEMENT_NODE *)node; + return WsXmlStringEquals( elem->localName, localname, NULL ) == S_OK && + WsXmlStringEquals( elem->ns, ns, NULL ) == S_OK; +} + static HRESULT read_message_id( WS_XML_READER *reader, GUID *ret ) { const WS_XML_NODE *node; @@ -914,6 +940,9 @@ static HRESULT read_envelope_start( struct msg *msg, WS_XML_READER *reader ) { static const WS_XML_STRING envelope = {8, (BYTE *)"Envelope"}, body = {4, (BYTE *)"Body"}; static const WS_XML_STRING header = {6, (BYTE *)"Header"}, msgid = {9, (BYTE *)"MessageID"}; + static const WS_XML_STRING fault = {5, (BYTE *)"Fault"}; + const WS_XML_STRING *ns_env = get_env_namespace( msg->version_env ); + BOOL isfault; HRESULT hr; if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; @@ -930,7 +959,10 @@ static HRESULT read_envelope_start( struct msg *msg, WS_XML_READER *reader ) } } if (!match_current_element( reader, &body )) return WS_E_INVALID_FORMAT; - return WsReadNode( reader, NULL ); + if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + + isfault = match_current_element_with_ns( reader, &fault, ns_env ); + return prop_set( msg->prop, msg->prop_count, WS_MESSAGE_PROPERTY_IS_FAULT, &isfault, sizeof(isfault) ); } /************************************************************************** diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 2af2dd334e7..feeedc940d5 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -1071,10 +1071,14 @@ static void test_WsReadEnvelopeStart(void) { static const char xml[] = "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body/></s:Envelope>"; - WS_MESSAGE *msg, *msg2; + static const char faultxml[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" + "<s:Fault/></s:Body></s:Envelope>"; + WS_MESSAGE *msg, *msg2, *msg3; WS_XML_READER *reader; WS_MESSAGE_STATE state; const WS_XML_NODE *node; + BOOL isfault; HRESULT hr; hr = WsReadEnvelopeStart( NULL, NULL, NULL, NULL, NULL ); @@ -1127,8 +1131,23 @@ static void test_WsReadEnvelopeStart(void) ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg3, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = set_input( reader, faultxml, strlen(faultxml) ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = WsReadEnvelopeStart( msg3, reader, NULL, NULL, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + isfault = FALSE; + hr = WsGetMessageProperty( msg3, WS_MESSAGE_PROPERTY_IS_FAULT, &isfault, sizeof(isfault), NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( isfault, "isfault == FALSE\n" ); + WsFreeMessage( msg ); WsFreeMessage( msg2 ); + WsFreeMessage( msg3 ); WsFreeReader( reader ); } diff --git a/include/webservices.h b/include/webservices.h index 6657ee84201..bda09e06bc8 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -113,6 +113,11 @@ typedef struct _WS_HEAP_PROPERTY { ULONG valueSize; } WS_HEAP_PROPERTY; +typedef struct _WS_HEAP_PROPERTIES { + WS_HEAP_PROPERTY *properties; + ULONG propertyCount; +} WS_HEAP_PROPERTIES; + typedef ULONG WS_XML_BUFFER_PROPERTY_ID; typedef struct _WS_XML_BUFFER_PROPERTY { @@ -145,6 +150,11 @@ typedef struct _WS_XML_READER_PROPERTY { ULONG valueSize; } WS_XML_READER_PROPERTY; +typedef struct _WS_XML_READER_PROPERTIES { + WS_XML_READER_PROPERTY *properties; + ULONG propertyCount; +} WS_XML_READER_PROPERTIES; + typedef enum { WS_XML_WRITER_PROPERTY_MAX_DEPTH, WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT, @@ -173,6 +183,11 @@ typedef struct _WS_XML_WRITER_PROPERTY { ULONG valueSize; } WS_XML_WRITER_PROPERTY; +typedef struct _WS_XML_WRITER_PROPERTIES { + WS_XML_WRITER_PROPERTY *properties; + ULONG propertyCount; +} WS_XML_WRITER_PROPERTIES; + typedef struct _WS_BYTES { ULONG length; BYTE *bytes;

1 0

Shaun Ren : webservices: Add support for reading WS_FAULT values.
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: 42980ed28a06aff93237924425c6fb9d16c644ec URL: https://gitlab.winehq.org/wine/wine/-/commit/42980ed28a06aff93237924425c6fb… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Aug 3 18:55:15 2022 -0400 webservices: Add support for reading WS_FAULT values. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/reader.c | 164 +++++++++++++++++++++++++++++++++++++++- dlls/webservices/tests/reader.c | 106 +++++++++++++++++--------- 2 files changed, 235 insertions(+), 35 deletions(-)

1 0

Paul Gofman : winhttp: Avoid invalid memory access in netconn_resolve().
by Alexandre Julliard 05 Aug '22

05 Aug '22

Module: wine Branch: master Commit: fa359ed9c88b75fd918c5aab5245114a54800dbf URL: https://gitlab.winehq.org/wine/wine/-/commit/fa359ed9c88b75fd918c5aab524511… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 4 17:47:32 2022 -0500 winhttp: Avoid invalid memory access in netconn_resolve(). --- dlls/winhttp/net.c | 64 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 31d8529f1d7..ab94b5bfd1d 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -752,18 +752,51 @@ static DWORD resolve_hostname( const WCHAR *name, INTERNET_PORT port, struct soc struct async_resolve { - const WCHAR *hostname; + LONG ref; + WCHAR *hostname; INTERNET_PORT port; - struct sockaddr_storage *addr; + struct sockaddr_storage addr; DWORD result; HANDLE done; }; +static struct async_resolve *create_async_resolve( const WCHAR *hostname, INTERNET_PORT port ) +{ + struct async_resolve *ret; + + if (!(ret = malloc(sizeof(*ret)))) + { + ERR( "No memory.\n" ); + return NULL; + } + ret->ref = 1; + ret->hostname = strdupW( hostname ); + ret->port = port; + if (!(ret->done = CreateEventW( NULL, FALSE, FALSE, NULL ))) + { + free( ret->hostname ); + free( ret ); + return NULL; + } + return ret; +} + +static void async_resolve_release( struct async_resolve *async ) +{ + if (InterlockedDecrement( &async->ref )) return; + + free( async->hostname ); + CloseHandle( async->done ); + free( async ); +} + static void CALLBACK resolve_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) { struct async_resolve *async = ctx; - async->result = resolve_hostname( async->hostname, async->port, async->addr ); + + async->result = resolve_hostname( async->hostname, async->port, &async->addr ); SetEvent( async->done ); + async_resolve_release( async ); } DWORD netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_storage *addr, int timeout ) @@ -773,20 +806,25 @@ DWORD netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_stor if (!timeout) ret = resolve_hostname( hostname, port, addr ); else { - struct async_resolve async; + struct async_resolve *async; + + if (!(async = create_async_resolve( hostname, port ))) + return ERROR_OUTOFMEMORY; - async.hostname = hostname; - async.port = port; - async.addr = addr; - if (!(async.done = CreateEventW( NULL, FALSE, FALSE, NULL ))) return GetLastError(); - if (!TrySubmitThreadpoolCallback( resolve_proc, &async, NULL )) + InterlockedIncrement( &async->ref ); + if (!TrySubmitThreadpoolCallback( resolve_proc, async, NULL )) { - CloseHandle( async.done ); + InterlockedDecrement( &async->ref ); + async_resolve_release( async ); return GetLastError(); } - if (WaitForSingleObject( async.done, timeout ) != WAIT_OBJECT_0) ret = ERROR_WINHTTP_TIMEOUT; - else ret = async.result; - CloseHandle( async.done ); + if (WaitForSingleObject( async->done, timeout ) != WAIT_OBJECT_0) ret = ERROR_WINHTTP_TIMEOUT; + else + { + *addr = async->addr; + ret = async->result; + } + async_resolve_release( async ); } return ret;

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2022