wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Owen Rudge : wsdapi/tests: Add tests for Scopes and XAddrs lists.
by Alexandre Julliard 24 Apr '18

24 Apr '18

Module: wine Branch: master Commit: 6b8e853e948a410949d203112b435df4c802f3e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b8e853e948a410949d20311… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 21:12:26 2018 +0100 wsdapi/tests: Add tests for Scopes and XAddrs lists. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 242c908..0576c8f 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -508,7 +508,8 @@ static void Publish_tests(void) WSADATA wsaData; BOOL messageOK, hello_message_seen = FALSE, endpoint_reference_seen = FALSE, app_sequence_seen = FALSE; BOOL metadata_version_seen = FALSE, any_header_seen = FALSE, wine_ns_seen = FALSE, body_hello_seen = FALSE; - BOOL any_body_seen = FALSE, types_seen = FALSE, xml_namespaces_seen = FALSE; + BOOL any_body_seen = FALSE, types_seen = FALSE, xml_namespaces_seen = FALSE, scopes_seen = FALSE; + BOOL xaddrs_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; @@ -525,7 +526,9 @@ static void Publish_tests(void) static const WCHAR prefix[] = {'w','i','n','e',0}; static const WCHAR uri2[] = {'h','t','t','p',':','/','/','m','o','r','e','.','t','e','s','t','s','/',0}; static const WCHAR prefix2[] = {'g','r','o','g',0}; + static const WCHAR uri3[] = {'h','t','t','p',':','/','/','t','h','i','r','d','.','u','r','l','/',0}; WSD_NAME_LIST types_list; + WSD_URI_LIST scopes_list, xaddrs_list; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); @@ -616,14 +619,29 @@ static void Publish_tests(void) types_list.Next->Next = NULL; types_list.Next->Element = &header_any_name; + /* Create scopes and xaddrs lists */ + scopes_list.Next = malloc(sizeof(WSD_URI_LIST)); + scopes_list.Element = uri; + + scopes_list.Next->Next = NULL; + scopes_list.Next->Element = uri2; + + xaddrs_list.Next = malloc(sizeof(WSD_URI_LIST)); + xaddrs_list.Element = uri2; + + xaddrs_list.Next->Next = NULL; + xaddrs_list.Next->Element = uri3; + /* Publish the service */ - rc = IWSDiscoveryPublisher_PublishEx(publisher, publisherIdW, 1, 1, 1, sequenceIdW, &types_list, NULL, NULL, - header_any_element, NULL, NULL, endpoint_any_element, body_any_element); + rc = IWSDiscoveryPublisher_PublishEx(publisher, publisherIdW, 1, 1, 1, sequenceIdW, &types_list, &scopes_list, + &xaddrs_list, header_any_element, NULL, NULL, endpoint_any_element, body_any_element); WSDFreeLinkedMemory(header_any_element); WSDFreeLinkedMemory(body_any_element); WSDFreeLinkedMemory(endpoint_any_element); free(types_list.Next); + free(scopes_list.Next); + free(xaddrs_list.Next); ok(rc == S_OK, "Publish failed: %08x\n", rc); @@ -661,9 +679,12 @@ static void Publish_tests(void) body_hello_seen = (strstr(msg, "<soap:Body><wsd:Hello") != NULL); any_body_seen = (strstr(msg, "<wine:Beer>BodyTest</wine:Beer>") != NULL); types_seen = (strstr(msg, "<wsd:Types>grog:Cider wine:Beer</wsd:Types>") != NULL); + scopes_seen = (strstr(msg, "<wsd:Scopes>http://wine.test/ http://more.tests/</wsd:Scopes>") != NULL); + xaddrs_seen = (strstr(msg, "<wsd:XAddrs>http://more.tests/ http://third.url/</wsd:XAddrs>") != NULL); xml_namespaces_seen = (strstr(msg, "xmlns:wine=\"http://wine.test/\" xmlns:grog=\"http://more.tests/\"") != NULL); messageOK = hello_message_seen && endpoint_reference_seen && app_sequence_seen && metadata_version_seen && - any_header_seen && wine_ns_seen && body_hello_seen && any_body_seen && types_seen && xml_namespaces_seen; + any_header_seen && wine_ns_seen && body_hello_seen && any_body_seen && types_seen && xml_namespaces_seen && + scopes_seen && xaddrs_seen; if (messageOK) break; } @@ -686,6 +707,8 @@ static void Publish_tests(void) ok(any_body_seen == TRUE, "Custom body element not received\n"); ok(types_seen == TRUE, "Types not received\n"); ok(xml_namespaces_seen == TRUE, "XML namespaces not received\n"); + ok(scopes_seen == TRUE, "Scopes not received\n"); + ok(xaddrs_seen == TRUE, "XAddrs not received\n"); after_publish_test:

1 0

Owen Rudge : wsdapi: Build and write Scopes and XAddrs lists for Hello message.
by Alexandre Julliard 24 Apr '18

24 Apr '18

Module: wine Branch: master Commit: 68095318b6093ceda6ba16197525f6c5ef794bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68095318b6093ceda6ba1619… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 21:12:23 2018 +0100 wsdapi: Build and write Scopes and XAddrs lists for Hello message. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 911fbd2..9ba934e 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -78,6 +78,8 @@ static const WCHAR helloString[] = { 'H','e','l','l','o', 0 }; static const WCHAR endpointReferenceString[] = { 'E','n','d','p','o','i','n','t','R','e','f','e','r','e','n','c','e', 0 }; static const WCHAR addressString[] = { 'A','d','d','r','e','s','s', 0 }; static const WCHAR typesString[] = { 'T','y','p','e','s', 0 }; +static const WCHAR scopesString[] = { 'S','c','o','p','e','s', 0 }; +static const WCHAR xAddrsString[] = { 'X','A','d','d','r','s', 0 }; struct discovered_namespace { @@ -532,6 +534,33 @@ static HRESULT build_types_list(LPWSTR buffer, size_t buffer_size, const WSD_NAM return S_OK; } +static HRESULT build_uri_list(LPWSTR buffer, size_t buffer_size, const WSD_URI_LIST *list) +{ + size_t memory_needed = 0, string_len = 0; + const WSD_URI_LIST *cur = list; + LPWSTR cur_buf_pos = buffer; + + do + { + /* Calculate space needed, including trailing space */ + string_len = lstrlenW(cur->Element); + memory_needed = (string_len + 1) * sizeof(WCHAR); + + if (cur_buf_pos + memory_needed > buffer + buffer_size) + return E_INVALIDARG; + + if (cur != list) + *cur_buf_pos++ = ' '; + + memcpy(cur_buf_pos, cur->Element, memory_needed); + cur_buf_pos += string_len; + + cur = cur->Next; + } while (cur != NULL); + + return S_OK; +} + static HRESULT duplicate_element(WSDXML_ELEMENT *parent, const WSDXML_ELEMENT *node, struct list *namespaces) { WSDXML_ATTRIBUTE *cur_attribute, *new_attribute, *last_attribute = NULL; @@ -913,6 +942,32 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON if (FAILED(ret)) goto cleanup; } + /* <wsd:Scopes> */ + if (scopes_list != NULL) + { + buffer = WSDAllocateLinkedMemory(hello_element, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR)); + if (buffer == NULL) goto failed; + + ret = build_uri_list(buffer, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR), scopes_list); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, hello_element, discoveryNsUri, scopesString, buffer, NULL); + if (FAILED(ret)) goto cleanup; + } + + /* <wsd:XAddrs> */ + if (xaddrs_list != NULL) + { + buffer = WSDAllocateLinkedMemory(hello_element, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR)); + if (buffer == NULL) goto failed; + + ret = build_uri_list(buffer, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR), xaddrs_list); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, hello_element, discoveryNsUri, xAddrsString, buffer, NULL); + if (FAILED(ret)) goto cleanup; + } + /* Write any body elements */ if (any != NULL) {

1 0

Owen Rudge : wsdapi/tests: Add tests for Types list.
by Alexandre Julliard 24 Apr '18

24 Apr '18

Module: wine Branch: master Commit: 03c7cae0c664d1b723ce1ea156a8dc3a1635cc32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c7cae0c664d1b723ce1ea1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 21:12:15 2018 +0100 wsdapi/tests: Add tests for Types list. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 3d88207..242c908 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -508,20 +508,24 @@ static void Publish_tests(void) WSADATA wsaData; BOOL messageOK, hello_message_seen = FALSE, endpoint_reference_seen = FALSE, app_sequence_seen = FALSE; BOOL metadata_version_seen = FALSE, any_header_seen = FALSE, wine_ns_seen = FALSE, body_hello_seen = FALSE; - BOOL any_body_seen = FALSE; + BOOL any_body_seen = FALSE, types_seen = FALSE, xml_namespaces_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; char *msg; WSDXML_ELEMENT *header_any_element, *body_any_element, *endpoint_any_element; - WSDXML_NAME header_any_name; - WSDXML_NAMESPACE ns; + WSDXML_NAME header_any_name, another_name; + WSDXML_NAMESPACE ns, ns2; WCHAR header_any_name_text[] = {'B','e','e','r',0}; + WCHAR another_name_text[] = {'C','i','d','e','r',0}; static const WCHAR header_any_text[] = {'P','u','b','l','i','s','h','T','e','s','t',0}; static const WCHAR body_any_text[] = {'B','o','d','y','T','e','s','t',0}; static const WCHAR endpoint_any_text[] = {'E','n','d','P','T','e','s','t',0}; static const WCHAR uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','t','e','s','t','/',0}; static const WCHAR prefix[] = {'w','i','n','e',0}; + static const WCHAR uri2[] = {'h','t','t','p',':','/','/','m','o','r','e','.','t','e','s','t','s','/',0}; + static const WCHAR prefix2[] = {'g','r','o','g',0}; + WSD_NAME_LIST types_list; rc = WSDCreateDiscoveryPublisher(NULL, &publisher); ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); @@ -599,13 +603,27 @@ static void Publish_tests(void) rc = WSDXMLBuildAnyForSingleElement(&header_any_name, endpoint_any_text, &endpoint_any_element); ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + /* Create types list */ + ns2.Uri = uri2; + ns2.PreferredPrefix = prefix2; + + another_name.LocalName = another_name_text; + another_name.Space = &ns2; + + types_list.Next = malloc(sizeof(WSD_NAME_LIST)); + types_list.Element = &another_name; + + types_list.Next->Next = NULL; + types_list.Next->Element = &header_any_name; + /* Publish the service */ - rc = IWSDiscoveryPublisher_PublishEx(publisher, publisherIdW, 1, 1, 1, sequenceIdW, NULL, NULL, NULL, + rc = IWSDiscoveryPublisher_PublishEx(publisher, publisherIdW, 1, 1, 1, sequenceIdW, &types_list, NULL, NULL, header_any_element, NULL, NULL, endpoint_any_element, body_any_element); WSDFreeLinkedMemory(header_any_element); WSDFreeLinkedMemory(body_any_element); WSDFreeLinkedMemory(endpoint_any_element); + free(types_list.Next); ok(rc == S_OK, "Publish failed: %08x\n", rc); @@ -642,8 +660,10 @@ static void Publish_tests(void) wine_ns_seen = (strstr(msg, "xmlns:wine=\"http://wine.test/\"") != NULL); body_hello_seen = (strstr(msg, "<soap:Body><wsd:Hello") != NULL); any_body_seen = (strstr(msg, "<wine:Beer>BodyTest</wine:Beer>") != NULL); + types_seen = (strstr(msg, "<wsd:Types>grog:Cider wine:Beer</wsd:Types>") != NULL); + xml_namespaces_seen = (strstr(msg, "xmlns:wine=\"http://wine.test/\" xmlns:grog=\"http://more.tests/\"") != NULL); messageOK = hello_message_seen && endpoint_reference_seen && app_sequence_seen && metadata_version_seen && - any_header_seen && wine_ns_seen && body_hello_seen && any_body_seen; + any_header_seen && wine_ns_seen && body_hello_seen && any_body_seen && types_seen && xml_namespaces_seen; if (messageOK) break; } @@ -664,6 +684,8 @@ static void Publish_tests(void) ok(wine_ns_seen == TRUE, "Wine namespace not received\n"); ok(body_hello_seen == TRUE, "Body and Hello elements not received\n"); ok(any_body_seen == TRUE, "Custom body element not received\n"); + ok(types_seen == TRUE, "Types not received\n"); + ok(xml_namespaces_seen == TRUE, "XML namespaces not received\n"); after_publish_test:

1 0

Owen Rudge : wsdapi: Build and write Types list for Hello message.
by Alexandre Julliard 24 Apr '18

24 Apr '18

Module: wine Branch: master Commit: e32fa5ce070bea83fd529f60aac4a643bcc98731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32fa5ce070bea83fd529f60… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 21:12:11 2018 +0100 wsdapi: Build and write Types list for Hello message. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index af77604..911fbd2 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -77,6 +77,7 @@ static const WCHAR bodyString[] = { 'B','o','d','y', 0 }; static const WCHAR helloString[] = { 'H','e','l','l','o', 0 }; static const WCHAR endpointReferenceString[] = { 'E','n','d','p','o','i','n','t','R','e','f','e','r','e','n','c','e', 0 }; static const WCHAR addressString[] = { 'A','d','d','r','e','s','s', 0 }; +static const WCHAR typesString[] = { 'T','y','p','e','s', 0 }; struct discovered_namespace { @@ -499,6 +500,38 @@ static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE * return TRUE; } +static HRESULT build_types_list(LPWSTR buffer, size_t buffer_size, const WSD_NAME_LIST *list, struct list *namespaces) +{ + WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; + LPWSTR current_buf_pos = buffer; + size_t memory_needed = 0; + const WSD_NAME_LIST *cur = list; + + do + { + /* Calculate space needed, including NULL character, colon and potential trailing space */ + memory_needed = sizeof(WCHAR) * (lstrlenW(cur->Element->LocalName) + + lstrlenW(cur->Element->Space->PreferredPrefix) + 3); + + if (current_buf_pos + memory_needed > buffer + buffer_size) + return E_INVALIDARG; + + if (cur != list) + *current_buf_pos++ = ' '; + + current_buf_pos += wsprintfW(current_buf_pos, format_string, cur->Element->Space->PreferredPrefix, + cur->Element->LocalName); + + /* Record the namespace in the discovered namespaces list */ + if (!add_discovered_namespace(namespaces, cur->Element->Space)) + return E_FAIL; + + cur = cur->Next; + } while (cur != NULL); + + return S_OK; +} + static HRESULT duplicate_element(WSDXML_ELEMENT *parent, const WSDXML_ELEMENT *node, struct list *namespaces) { WSDXML_ATTRIBUTE *cur_attribute, *new_attribute, *last_attribute = NULL; @@ -827,6 +860,7 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON WSD_APP_SEQUENCE sequence; WCHAR message_id[64]; HRESULT ret = E_OUTOFMEMORY; + LPWSTR buffer; sequence.InstanceId = instance_id; sequence.MessageNumber = msg_num; @@ -866,6 +900,19 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON if (FAILED(ret)) goto cleanup; } + /* <wsd:Types> */ + if (types_list != NULL) + { + buffer = WSDAllocateLinkedMemory(hello_element, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR)); + if (buffer == NULL) goto failed; + + ret = build_types_list(buffer, WSD_MAX_TEXT_LENGTH * sizeof(WCHAR), types_list, discoveredNamespaces); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, hello_element, discoveryNsUri, typesString, buffer, NULL); + if (FAILED(ret)) goto cleanup; + } + /* Write any body elements */ if (any != NULL) {

1 0

Owen Rudge : wsdapi/tests: Add test for endpoint reference "any" parameter.
by Alexandre Julliard 24 Apr '18

24 Apr '18

Module: wine Branch: master Commit: e7a5fc50dcfbab8cc055b84882bdfd4a5e351877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a5fc50dcfbab8cc055b848… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 21:12:07 2018 +0100 wsdapi/tests: Add test for endpoint reference "any" parameter. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index c7fe8cf..3d88207 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -513,12 +513,13 @@ static void Publish_tests(void) HRESULT rc; ULONG ref; char *msg; - WSDXML_ELEMENT *header_any_element, *body_any_element; + WSDXML_ELEMENT *header_any_element, *body_any_element, *endpoint_any_element; WSDXML_NAME header_any_name; WSDXML_NAMESPACE ns; WCHAR header_any_name_text[] = {'B','e','e','r',0}; static const WCHAR header_any_text[] = {'P','u','b','l','i','s','h','T','e','s','t',0}; static const WCHAR body_any_text[] = {'B','o','d','y','T','e','s','t',0}; + static const WCHAR endpoint_any_text[] = {'E','n','d','P','T','e','s','t',0}; static const WCHAR uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','t','e','s','t','/',0}; static const WCHAR prefix[] = {'w','i','n','e',0}; @@ -595,12 +596,16 @@ static void Publish_tests(void) rc = WSDXMLBuildAnyForSingleElement(&header_any_name, body_any_text, &body_any_element); ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + rc = WSDXMLBuildAnyForSingleElement(&header_any_name, endpoint_any_text, &endpoint_any_element); + ok(rc == S_OK, "WSDXMLBuildAnyForSingleElement failed with %08x\n", rc); + /* Publish the service */ rc = IWSDiscoveryPublisher_PublishEx(publisher, publisherIdW, 1, 1, 1, sequenceIdW, NULL, NULL, NULL, - header_any_element, NULL, NULL, NULL, body_any_element); + header_any_element, NULL, NULL, endpoint_any_element, body_any_element); WSDFreeLinkedMemory(header_any_element); WSDFreeLinkedMemory(body_any_element); + WSDFreeLinkedMemory(endpoint_any_element); ok(rc == S_OK, "Publish failed: %08x\n", rc); @@ -617,7 +622,7 @@ static void Publish_tests(void) /* Verify we've received a message */ ok(msgStorage->messageCount >= 1, "No messages received\n"); - sprintf(endpointReferenceString, "<wsa:EndpointReference><wsa:Address>%s</wsa:Address></wsa:EndpointReference>", publisherId); + sprintf(endpointReferenceString, "<wsa:EndpointReference><wsa:Address>%s</wsa:Address><wine:Beer>EndPTest</wine:Beer></wsa:EndpointReference>", publisherId); sprintf(app_sequence_string, "<wsd:AppSequence InstanceId=\"1\" SequenceId=\"%s\" MessageNumber=\"1\"></wsd:AppSequence>", sequenceId);

1 0

Owen Rudge : wsdapi: Write EndPointReference section in Hello message body.
by Alexandre Julliard 24 Apr '18

24 Apr '18

Module: wine Branch: master Commit: 7a044047974750e0b62c4cb63111ce82bc2e000e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a044047974750e0b62c4cb6… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 21:12:01 2018 +0100 wsdapi: Write EndPointReference section in Hello message body. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 21 +++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index a2a4223..af77604 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -75,6 +75,8 @@ static const WCHAR sequenceIdString[] = { 'S','e','q','u','e','n','c','e','I','d static const WCHAR emptyString[] = { 0 }; static const WCHAR bodyString[] = { 'B','o','d','y', 0 }; static const WCHAR helloString[] = { 'H','e','l','l','o', 0 }; +static const WCHAR endpointReferenceString[] = { 'E','n','d','p','o','i','n','t','R','e','f','e','r','e','n','c','e', 0 }; +static const WCHAR addressString[] = { 'A','d','d','r','e','s','s', 0 }; struct discovered_namespace { @@ -284,7 +286,7 @@ static HRESULT add_child_element(IWSDXMLContext *xml_context, WSDXML_ELEMENT *pa return ret; } - *out = element_obj; + if (out != NULL) *out = element_obj; return ret; } @@ -818,7 +820,7 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON const WSD_URI_LIST *xaddrs_list, const WSDXML_ELEMENT *hdr_any, const WSDXML_ELEMENT *ref_param_any, const WSDXML_ELEMENT *endpoint_ref_any, const WSDXML_ELEMENT *any) { - WSDXML_ELEMENT *body_element = NULL, *hello_element; + WSDXML_ELEMENT *body_element = NULL, *hello_element, *endpoint_reference_element; struct list *discoveredNamespaces = NULL; WSDXML_NAME *body_name = NULL; WSD_SOAP_HEADER soapHeader; @@ -849,6 +851,21 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON ret = add_child_element(impl->xmlContext, body_element, discoveryNsUri, helloString, NULL, &hello_element); if (FAILED(ret)) goto cleanup; + /* <wsa:EndpointReference>, <wsa:Address> */ + ret = add_child_element(impl->xmlContext, hello_element, addressingNsUri, endpointReferenceString, NULL, + &endpoint_reference_element); + if (FAILED(ret)) goto cleanup; + + ret = add_child_element(impl->xmlContext, endpoint_reference_element, addressingNsUri, addressString, id, NULL); + if (FAILED(ret)) goto cleanup; + + /* Write any endpoint reference headers */ + if (endpoint_ref_any != NULL) + { + ret = duplicate_element(endpoint_reference_element, endpoint_ref_any, discoveredNamespaces); + if (FAILED(ret)) goto cleanup; + } + /* Write any body elements */ if (any != NULL) { diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 608edb5..c7fe8cf 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -651,7 +651,7 @@ static void Publish_tests(void) heap_free(msgStorage); ok(hello_message_seen == TRUE, "Hello message not received\n"); - todo_wine ok(endpoint_reference_seen == TRUE, "EndpointReference not received\n"); + ok(endpoint_reference_seen == TRUE, "EndpointReference not received\n"); ok(app_sequence_seen == TRUE, "AppSequence not received\n"); todo_wine ok(metadata_version_seen == TRUE, "MetadataVersion not received\n"); todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n");

1 0

Thomas Faber : msxml3: Avoid buffer overflow in BindStatusCallback_GetBindInfo (DPH).
by Alexandre Julliard 24 Apr '18

24 Apr '18

Module: wine Branch: master Commit: a64403904dfc50ed81c1a724f9a322e5ae4a025b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a64403904dfc50ed81c1a724… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Apr 23 12:08:58 2018 +0200 msxml3: Avoid buffer overflow in BindStatusCallback_GetBindInfo (DPH). Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 40a9764..07eeb74 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -397,7 +397,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, pbindinfo->dwBindVerb = This->request->verb; if (This->request->verb == BINDVERB_CUSTOM) { - pbindinfo->szCustomVerb = CoTaskMemAlloc(SysStringByteLen(This->request->custom)); + pbindinfo->szCustomVerb = CoTaskMemAlloc(SysStringByteLen(This->request->custom)+sizeof(WCHAR)); strcpyW(pbindinfo->szCustomVerb, This->request->custom); }

1 0

Józef Kucia : d3d11/tests: Add test for stream output without geometry shaders.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: ee7756fdfd46cd64a09089def3c330a3b262cdd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee7756fdfd46cd64a09089de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 23 16:20:18 2018 +0200 d3d11/tests: Add test for stream output without geometry shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 91cf2d1..8279093 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -22974,6 +22974,187 @@ static void test_stream_output_components(void) release_test_context(&test_context); } +static void test_stream_output_vs(void) +{ + const D3D11_SO_DECLARATION_ENTRY *current_so_declaration; + struct d3d11_test_context test_context; + ID3D11InputLayout *input_layout; + ID3D11Buffer *vb, *so_buffer; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11GeometryShader *gs; + ID3D11VertexShader *vs; + ID3D11Device *device; + const float *result; + unsigned int offset; + unsigned int i, j; + HRESULT hr; + + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const DWORD vs_code[] = + { +#if 0 + struct vertex + { + float4 position : POSITION; + float4 color0 : COLOR0; + float4 color1 : COLOR1; + }; + + vertex main(in vertex i) + { + return i; + } +#endif + 0x43425844, 0xa67e993e, 0x1632c139, 0x02a7725f, 0xfb0221cd, 0x00000001, 0x00000194, 0x00000003, + 0x0000002c, 0x00000094, 0x000000fc, 0x4e475349, 0x00000060, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000059, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x00000059, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000f0f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, 0xab00524f, 0x4e47534f, 0x00000060, 0x00000003, + 0x00000008, 0x00000050, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000059, + 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x00000059, 0x00000001, 0x00000000, + 0x00000003, 0x00000002, 0x0000000f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, 0xab00524f, 0x52444853, + 0x00000090, 0x00010040, 0x00000024, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, + 0x00000001, 0x0300005f, 0x001010f2, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, + 0x001020f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, + 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, 0x05000036, + 0x001020f2, 0x00000002, 0x00101e46, 0x00000002, 0x0100003e, + }; + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 32, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const D3D11_SO_DECLARATION_ENTRY all_so_decl[] = + { + {0, "POSITION", 0, 0, 4, 0}, + {0, "COLOR", 0, 0, 3, 0}, + {0, "COLOR", 1, 0, 2, 0}, + }; + static const D3D11_SO_DECLARATION_ENTRY position_so_decl[] = + { + {0, "POSITION", 0, 0, 4, 0}, + }; + static const D3D11_SO_DECLARATION_ENTRY position2_so_decl[] = + { + {0, "POSITION", 0, 0, 2, 0}, + }; + static const struct + { + struct vec4 position; + struct vec4 color0; + struct vec4 color1; + } + vb_data[] = + { + {{-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f, 2.0f, 3.0f, 4.0f}, {5.0f, 6.0f, 7.0f, 8.0f}}, + {{-1.0f, 1.0f, 0.0f, 1.0f}, {9.0f, 1.1f, 1.2f, 1.3f}, {1.4f, 1.5f, 1.6f, 1.7f}}, + {{ 1.0f, -1.0f, 0.0f, 1.0f}, {1.8f, 1.9f, 2.0f, 2.1f}, {2.2f, 2.3f, 2.4f, 2.5f}}, + {{ 1.0f, 1.0f, 0.0f, 1.0f}, {2.5f, 2.6f, 2.7f, 2.8f}, {2.9f, 3.0f, 3.1f, 3.2f}}, + }; + static const unsigned int vb_stride[] = {sizeof(*vb_data)}; + static const float expected_data[] = + { + -1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 2.0f, 3.0f, 5.0f, 6.0f, + -1.0f, 1.0f, 0.0f, 1.0f, 9.0f, 1.1f, 1.2f, 1.4f, 1.5f, + 1.0f, -1.0f, 0.0f, 1.0f, 1.8f, 1.9f, 2.0f, 2.2f, 2.3f, + 1.0f, 1.0f, 0.0f, 1.0f, 2.5f, 2.6f, 2.7f, 2.9f, 3.0f, + }; + static const float expected_data2[] = + { + -1.0f, -1.0f, 0.0f, 1.0f, + -1.0f, 1.0f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.0f, 1.0f, + 1.0f, 1.0f, 0.0f, 1.0f, + }; + static const float expected_data3[] = + { + -1.0f, -1.0f, + -1.0f, 1.0f, + 1.0f, -1.0f, + 1.0f, 1.0f, + }; + static const struct + { + const D3D11_SO_DECLARATION_ENTRY *so_declaration; + unsigned int so_entry_count; + const float *expected_data; + unsigned int expected_data_size; + } + tests[] = + { + {all_so_decl, ARRAY_SIZE(all_so_decl), expected_data, ARRAY_SIZE(expected_data)}, + {position_so_decl, ARRAY_SIZE(position_so_decl), expected_data2, ARRAY_SIZE(expected_data2)}, + {position2_so_decl, ARRAY_SIZE(position2_so_decl), expected_data3, ARRAY_SIZE(expected_data3)}, + }; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(vb_data), vb_data); + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, 1024, NULL); + + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, vb_stride, &offset); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST); + + gs = NULL; + current_so_declaration = NULL; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (current_so_declaration != tests[i].so_declaration) + { + if (gs) + ID3D11GeometryShader_Release(gs); + + hr = ID3D11Device_CreateGeometryShaderWithStreamOutput(device, vs_code, sizeof(vs_code), + tests[i].so_declaration, tests[i].so_entry_count, NULL, 0, + D3D11_SO_NO_RASTERIZED_STREAM, NULL, &gs); + ok(hr == S_OK, "Failed to create geometry shader with stream output, hr %#x.\n", hr); + ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); + current_so_declaration = tests[i].so_declaration; + } + + offset = 0; + ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); + + ID3D11DeviceContext_Draw(context, 4, 0); + + get_buffer_readback(so_buffer, &rb); + result = rb.map_desc.pData; + for (j = 0; j < tests[i].expected_data_size; ++j) + { + float expected_value = tests[i].expected_data[j]; + ok(compare_float(result[j], expected_value, 2), + "Test %u: Got %.8e, expected %.8e at %u.\n", + i, result[j], expected_value, j); + } + release_resource_readback(&rb); + } + + ID3D11Buffer_Release(vb); + ID3D11Buffer_Release(so_buffer); + ID3D11VertexShader_Release(vs); + ID3D11GeometryShader_Release(gs); + ID3D11InputLayout_Release(input_layout); + release_test_context(&test_context); +} + static void test_gather(void) { struct @@ -26390,6 +26571,7 @@ START_TEST(d3d11) test_fl10_stream_output_desc(); test_stream_output_resume(); test_stream_output_components(); + test_stream_output_vs(); test_gather(); test_gather_c(); test_depth_bias();

1 0

Józef Kucia : wined3d: Avoid using gl_ViewportIndex unnecessarily.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 3702e2bc42c7116a9c3bc6301ed40e6fa504853c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3702e2bc42c7116a9c3bc630… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 23 16:20:17 2018 +0200 wined3d: Avoid using gl_ViewportIndex unnecessarily. Fixes geometry shaders when ARB_viewport_array is not available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 16 +++++++++------- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 56f7968..e29730c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5152,11 +5152,11 @@ static void shader_glsl_else(const struct wined3d_shader_instruction *ins) static void shader_glsl_emit(const struct wined3d_shader_instruction *ins) { unsigned int stream = ins->handler_idx == WINED3DSIH_EMIT ? 0 : ins->src[0].reg.idx[0].offset; + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; - shader_addline(ins->ctx->buffer, "gl_ViewportIndex = 0;\n"); shader_addline(ins->ctx->buffer, "setup_gs_output(gs_out);\n"); if (!ins->ctx->gl_info->supported[ARB_CLIP_CONTROL]) - shader_glsl_fixup_position(ins->ctx->buffer, TRUE); + shader_glsl_fixup_position(ins->ctx->buffer, reg_maps->viewport_array); if (!stream) shader_addline(ins->ctx->buffer, "EmitVertex();\n"); @@ -8244,7 +8244,12 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_addline(buffer, "in shader_in_out { vec4 reg[%u]; } shader_in[];\n", shader->limits->packed_input); if (!gl_info->supported[ARB_CLIP_CONTROL]) - shader_addline(buffer, "uniform vec4 pos_fixup[%u];\n", WINED3D_MAX_VIEWPORTS); + { + shader_addline(buffer, "uniform vec4 pos_fixup"); + if (reg_maps->viewport_array) + shader_addline(buffer, "[%u]", WINED3D_MAX_VIEWPORTS); + shader_addline(buffer, ";\n"); + } if (is_rasterization_disabled(shader)) { @@ -8274,10 +8279,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context } shader_addline(buffer, "setup_gs_output(gs_out);\n"); if (!gl_info->supported[ARB_CLIP_CONTROL]) - { - shader_addline(buffer, "gl_ViewportIndex = 0;\n"); - shader_glsl_fixup_position(buffer, TRUE); - } + shader_glsl_fixup_position(buffer, FALSE); shader_addline(buffer, "EmitVertex();\n"); } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 07e810c..b757d93 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1807,6 +1807,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st return hr; reg_maps->cull_distance_mask |= mask; } + else if (e->sysval_semantic == WINED3D_SV_VIEWPORT_ARRAY_INDEX) + { + reg_maps->viewport_array = 1; + } } } else if (reg_maps->output_registers) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a3282b3..10bb607 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1030,7 +1030,8 @@ struct wined3d_shader_reg_maps DWORD point_size : 1; DWORD vocp : 1; DWORD input_rel_addressing : 1; - DWORD padding : 16; + DWORD viewport_array : 1; + DWORD padding : 15; DWORD rt_mask; /* Used render targets, 32 max. */

1 0

Józef Kucia : wined3d: Add support for stream output with vertex shaders.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: ca8e05154e4be5f9f378dd5611c775ec5621e74f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca8e05154e4be5f9f378dd56… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 23 16:20:16 2018 +0200 wined3d: Add support for stream output with vertex shaders. In Direct3D, a stream-output geometry shader can be created from a vertex shader bytecode. We generate a pass-through geometry shader in this case. Pass-through geometry shaders are helpful because they can easily split outputs when rasterization is disabed. We could also add another codepath in order to avoid geometry shaders when possible. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 1 - dlls/d3d11/tests/d3d11.c | 4 --- dlls/wined3d/context.c | 4 ++- dlls/wined3d/cs.c | 3 +++ dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 56 +++++++++++++++++++++++++++++++++++--- dlls/wined3d/shader.c | 61 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 2 ++ 8 files changed, 108 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca8e05154e4be5f9f378…

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
55
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 April 2018