wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Owen Rudge : wsdapi: Implement generation of SOAP header.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 45371b53f36e10c1e535407a707113f049f8a551 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45371b53f36e10c1e535407a… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 19 21:46:34 2018 +0000 wsdapi: Implement generation of SOAP header. 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 | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 834005e..abea33c 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -63,6 +63,13 @@ static const WCHAR envelopeNsUri[] = { static const WCHAR addressingPrefix[] = { 'w','s','a', 0 }; static const WCHAR discoveryPrefix[] = { 'w','s','d', 0 }; static const WCHAR envelopePrefix[] = { 's','o','a','p', 0 }; +static const WCHAR headerString[] = { 'H','e','a','d','e','r', 0 }; +static const WCHAR actionString[] = { 'A','c','t','i','o','n', 0 }; +static const WCHAR messageIdString[] = { 'M','e','s','s','a','g','e','I','D', 0 }; +static const WCHAR toString[] = { 'T','o', 0 }; +static const WCHAR relatesToString[] = { 'R','e','l','a','t','e','s','T','o', 0 }; +static const WCHAR appSequenceString[] = { 'A','p','p','S','e','q','u','e','n','c','e', 0 }; +static const WCHAR emptyString[] = { 0 }; static char *wide_to_utf8(LPCWSTR wide_string, int *length) { @@ -183,6 +190,33 @@ cleanup: return retVal; } +static WSDXML_ELEMENT *add_child_element(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, + LPCWSTR name, LPCWSTR text) +{ + WSDXML_ELEMENT *element_obj; + WSDXML_NAME *name_obj; + + if (FAILED(IWSDXMLContext_AddNameToNamespace(xml_context, ns_uri, name, &name_obj))) + return NULL; + + if (FAILED(WSDXMLBuildAnyForSingleElement(name_obj, text, &element_obj))) + { + WSDFreeLinkedMemory(name_obj); + return NULL; + } + + WSDFreeLinkedMemory(name_obj); + + /* Add the element as a child - this will link the element's memory allocation to the parent's */ + if (FAILED(WSDXMLAddChild(parent, element_obj))) + { + WSDFreeLinkedMemory(element_obj); + return NULL; + } + + return element_obj; +} + static BOOL create_guid(LPWSTR buffer) { const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; @@ -220,7 +254,55 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac static WSDXML_ELEMENT *create_soap_header_xml_elements(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header) { - /* TODO: Implement header generation */ + WSDXML_ELEMENT *header_element = NULL, *app_sequence_element = NULL; + WSDXML_NAME *header_name = NULL; + + /* <s:Header> */ + if (FAILED(IWSDXMLContext_AddNameToNamespace(xml_context, envelopeNsUri, headerString, &header_name))) goto cleanup; + if (FAILED(WSDXMLBuildAnyForSingleElement(header_name, NULL, &header_element))) goto cleanup; + WSDFreeLinkedMemory(header_name); + + /* <a:Action> */ + if (add_child_element(xml_context, header_element, addressingNsUri, actionString, header->Action) == NULL) + goto cleanup; + + /* <a:MessageId> */ + if (add_child_element(xml_context, header_element, addressingNsUri, messageIdString, header->MessageID) == NULL) + goto cleanup; + + /* <a:To> */ + if (add_child_element(xml_context, header_element, addressingNsUri, toString, header->To) == NULL) + goto cleanup; + + /* <a:RelatesTo> */ + if (header->RelatesTo.MessageID != NULL) + { + if (add_child_element(xml_context, header_element, addressingNsUri, relatesToString, + header->RelatesTo.MessageID) == NULL) goto cleanup; + } + + /* <d:AppSequence> */ + app_sequence_element = add_child_element(xml_context, header_element, discoveryNsUri, appSequenceString, emptyString); + if (app_sequence_element == NULL) goto cleanup; + + /* TODO: InstanceId attribute */ + + /* TODO: MessageNumber attribute */ + + /* TODO: SequenceID attribute */ + + /* </d:AppSequence> */ + + /* TODO: Write any headers */ + + /* </s:Header> */ + + return header_element; + +cleanup: + if (header_name != NULL) WSDFreeLinkedMemory(header_name); + WSDXMLCleanupElement(header_element); + return NULL; }

1 0

Owen Rudge : wsdapi: Implement writing of XML elements.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 151025809dfa523ca108806d4552db01ff869c5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=151025809dfa523ca108806d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 19 21:46:29 2018 +0000 wsdapi: Implement writing of XML elements. 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 | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index bec4b1d..834005e 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -116,6 +116,73 @@ static inline void free_xml_string(WS_XML_STRING *value) heap_free(value); } +static BOOL write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) +{ + WS_XML_STRING *local_name = NULL, *element_ns = NULL, *ns_prefix = NULL; + WS_XML_UTF16_TEXT utf16_text; + WSDXML_NODE *current_child; + WSDXML_TEXT *node_as_text; + BOOL retVal = FALSE; + int text_len; + HRESULT ret; + + if (element == NULL) + return TRUE; + + /* Start the element */ + local_name = populate_xml_string(element->Name->LocalName); + if (local_name == NULL) goto cleanup; + + element_ns = populate_xml_string(element->Name->Space->Uri); + if (element_ns == NULL) goto cleanup; + + ns_prefix = populate_xml_string(element->Name->Space->PreferredPrefix); + if (ns_prefix == NULL) goto cleanup; + + ret = WsWriteStartElement(writer, ns_prefix, local_name, element_ns, NULL); + if (FAILED(ret)) goto cleanup; + + /* TODO: Write attributes */ + + /* Write child elements */ + current_child = element->FirstChild; + + while (current_child != NULL) + { + if (current_child->Type == ElementType) + { + if (!write_xml_element((WSDXML_ELEMENT *)current_child, writer)) goto cleanup; + } + else if (current_child->Type == TextType) + { + node_as_text = (WSDXML_TEXT *)current_child; + text_len = lstrlenW(node_as_text->Text); + + utf16_text.text.textType = WS_XML_TEXT_TYPE_UTF16; + utf16_text.byteCount = min(WSD_MAX_TEXT_LENGTH, text_len) * sizeof(WCHAR); + utf16_text.bytes = (BYTE *)node_as_text->Text; + + ret = WsWriteText(writer, (WS_XML_TEXT *)&utf16_text, NULL); + if (FAILED(ret)) goto cleanup; + } + + current_child = current_child->Next; + } + + /* End the element */ + ret = WsWriteEndElement(writer, NULL); + if (FAILED(ret)) goto cleanup; + + retVal = TRUE; + +cleanup: + free_xml_string(local_name); + free_xml_string(element_ns); + free_xml_string(ns_prefix); + + return retVal; +} + static BOOL create_guid(LPWSTR buffer) { const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; @@ -207,7 +274,8 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER ret = WsWriteStartElement(writer, actual_envelope_prefix, &envelope, envelope_uri_xmlstr, NULL); if (FAILED(ret)) goto cleanup; - /* TODO: Write the header */ + /* Write the header */ + if (!write_xml_element(header_element, writer)) goto cleanup; ret = WsWriteEndElement(writer, NULL); if (FAILED(ret)) goto cleanup;

1 0

Owen Rudge : wsdapi: Implement generation of XML from WSDXML structures.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: a2c733c057881b3529bc4a701d735cfb43944dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c733c057881b3529bc4a70… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 19 21:46:23 2018 +0000 wsdapi: Implement generation of XML from WSDXML structures. 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/Makefile.in | 2 +- dlls/wsdapi/soap.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 177 insertions(+), 8 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index e3f3348..f5eb0fd 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = wsdapi.dll IMPORTLIB = wsdapi -IMPORTS = bcrypt iphlpapi rpcrt4 user32 ws2_32 +IMPORTS = bcrypt iphlpapi rpcrt4 user32 webservices ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index c33c73b..bec4b1d 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -26,6 +26,7 @@ #include "wsdapi_internal.h" #include "wine/debug.h" #include "wine/heap.h" +#include "webservices.h" WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); @@ -44,6 +45,77 @@ static const WCHAR actionHello[] = { 'd','i','s','c','o','v','e','r','y','/', 'H','e','l','l','o', 0 }; +static const WCHAR addressingNsUri[] = { + 'h','t','t','p',':','/','/', + 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', + 'w','s','/','2','0','0','4','/','0','8','/','a','d','d','r','e','s','s','i','n','g', 0 }; + +static const WCHAR discoveryNsUri[] = { + 'h','t','t','p',':','/','/', + 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', + 'w','s','/','2','0','0','5','/','0','4','/','d','i','s','c','o','v','e','r','y', 0 }; + +static const WCHAR envelopeNsUri[] = { + 'h','t','t','p',':','/','/', + 'w','w','w','.','w','3','.','o','r','g','/', + '2','0','0','3','/','0','5','/','s','o','a','p','-','e','n','v','e','l','o','p','e', 0 }; + +static const WCHAR addressingPrefix[] = { 'w','s','a', 0 }; +static const WCHAR discoveryPrefix[] = { 'w','s','d', 0 }; +static const WCHAR envelopePrefix[] = { 's','o','a','p', 0 }; + +static char *wide_to_utf8(LPCWSTR wide_string, int *length) +{ + char *new_string = NULL; + + if (wide_string == NULL) + return NULL; + + *length = WideCharToMultiByte(CP_UTF8, 0, wide_string, -1, NULL, 0, NULL, NULL); + + if (*length < 0) + return NULL; + + new_string = heap_alloc(*length); + WideCharToMultiByte(CP_UTF8, 0, wide_string, -1, new_string, *length, NULL, NULL); + + return new_string; +} + +static WS_XML_STRING *populate_xml_string(LPCWSTR str) +{ + WS_XML_STRING *xml = heap_alloc_zero(sizeof(WS_XML_STRING)); + int utf8Length; + + if (xml == NULL) + return NULL; + + xml->bytes = (BYTE *)wide_to_utf8(str, &utf8Length); + + if (xml->bytes == NULL) + { + heap_free(xml); + return NULL; + } + + xml->dictionary = NULL; + xml->id = 0; + xml->length = (xml->bytes == NULL) ? 0 : (utf8Length - 1); + + return xml; +} + +static inline void free_xml_string(WS_XML_STRING *value) +{ + if (value == NULL) + return; + + if (value->bytes != NULL) + heap_free(value->bytes); + + heap_free(value); +} + static BOOL create_guid(LPWSTR buffer) { const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; @@ -79,30 +151,126 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac /* TODO: Implement RelatesTo, ReplyTo, From, FaultTo */ } +static WSDXML_ELEMENT *create_soap_header_xml_elements(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header) +{ + /* TODO: Implement header generation */ + return NULL; +} + +static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header, WSDXML_ELEMENT *body_element, + WS_HEAP **heap, char **output_xml, ULONG *xml_length, struct list *discovered_namespaces) +{ + WS_XML_STRING *actual_envelope_prefix = NULL, *envelope_uri_xmlstr = NULL; + WSDXML_NAMESPACE *addressing_ns = NULL, *discovery_ns = NULL, *envelope_ns = NULL; + WSDXML_ELEMENT *header_element = NULL; + WS_XML_BUFFER *buffer = NULL; + WS_XML_WRITER *writer = NULL; + WS_XML_STRING envelope; + HRESULT ret = E_OUTOFMEMORY; + static BYTE envelopeString[] = "Envelope"; + + /* Create the necessary XML prefixes */ + if (FAILED(IWSDXMLContext_AddNamespace(xml_context, addressingNsUri, addressingPrefix, &addressing_ns))) goto cleanup; + + if (FAILED(IWSDXMLContext_AddNamespace(xml_context, discoveryNsUri, discoveryPrefix, &discovery_ns))) goto cleanup; + + if (FAILED(IWSDXMLContext_AddNamespace(xml_context, envelopeNsUri, envelopePrefix, &envelope_ns))) goto cleanup; + + envelope.bytes = envelopeString; + envelope.length = sizeof(envelopeString) - 1; + envelope.dictionary = NULL; + envelope.id = 0; + + actual_envelope_prefix = populate_xml_string(envelope_ns->PreferredPrefix); + envelope_uri_xmlstr = populate_xml_string(envelope_ns->Uri); + + if ((actual_envelope_prefix == NULL) || (envelope_uri_xmlstr == NULL)) goto cleanup; + + /* Now try to create the appropriate WebServices buffers, etc */ + ret = WsCreateHeap(16384, 4096, NULL, 0, heap, NULL); + if (FAILED(ret)) goto cleanup; + + ret = WsCreateXmlBuffer(*heap, NULL, 0, &buffer, NULL); + if (FAILED(ret)) goto cleanup; + + ret = WsCreateWriter(NULL, 0, &writer, NULL); + if (FAILED(ret)) goto cleanup; + + ret = WsSetOutputToBuffer(writer, buffer, NULL, 0, NULL); + if (FAILED(ret)) goto cleanup; + + /* Create the header XML elements */ + header_element = create_soap_header_xml_elements(xml_context, header); + if (header_element == NULL) goto cleanup; + + /* <s:Envelope> */ + ret = WsWriteStartElement(writer, actual_envelope_prefix, &envelope, envelope_uri_xmlstr, NULL); + if (FAILED(ret)) goto cleanup; + + /* TODO: Write the header */ + + ret = WsWriteEndElement(writer, NULL); + if (FAILED(ret)) goto cleanup; + + /* </s:Envelope> */ + + /* Generate the bytes of the document */ + ret = WsWriteXmlBufferToBytes(writer, buffer, NULL, NULL, 0, *heap, (void**)output_xml, xml_length, NULL); + if (FAILED(ret)) goto cleanup; + +cleanup: + WSDFreeLinkedMemory(addressing_ns); + WSDFreeLinkedMemory(discovery_ns); + WSDFreeLinkedMemory(envelope_ns); + + WSDXMLCleanupElement(header_element); + + free_xml_string(actual_envelope_prefix); + free_xml_string(envelope_uri_xmlstr); + + if (writer != NULL) + WsFreeWriter(writer); + + /* Don't free the heap unless the operation has failed */ + if ((FAILED(ret)) && (*heap != NULL)) + { + WsFreeHeap(*heap); + *heap = NULL; + } + + return ret; +} + static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_HEADER *header, WSDXML_ELEMENT *body_element, struct list *discovered_namespaces, IWSDUdpAddress *remote_address, int max_initial_delay) { static const char xml_header[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; - ULONG xml_header_len = sizeof(xml_header) - 1; - HRESULT ret = E_FAIL; + ULONG xml_length = 0, xml_header_len = sizeof(xml_header) - 1; + WS_HEAP *heap = NULL; + char *xml = NULL; char *full_xml; + HRESULT ret; - /* TODO: Create SOAP envelope */ + ret = create_soap_envelope(impl->xmlContext, header, NULL, &heap, &xml, &xml_length, NULL); + if (ret != S_OK) return ret; /* Prefix the XML header */ - full_xml = heap_alloc(xml_header_len + 1); + full_xml = heap_alloc(xml_length + xml_header_len + 1); if (full_xml == NULL) + { + WsFreeHeap(heap); return E_OUTOFMEMORY; + } memcpy(full_xml, xml_header, xml_header_len); - full_xml[xml_header_len] = 0; + memcpy(full_xml + xml_header_len, xml, xml_length); + full_xml[xml_length + xml_header_len] = 0; if (remote_address == NULL) { /* Send the message via UDP multicast */ - if (send_udp_multicast(impl, full_xml, sizeof(xml_header), max_initial_delay)) - ret = S_OK; + ret = send_udp_multicast(impl, full_xml, xml_length + xml_header_len + 1, max_initial_delay) ? S_OK : E_FAIL; } else { @@ -111,6 +279,7 @@ static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_ } heap_free(full_xml); + WsFreeHeap(heap); return ret; }

1 0

Owen Rudge : wsdapi: Populate SOAP header structure.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 42d6d92d0d28d58378ea55d6275723bad1645e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42d6d92d0d28d58378ea55d6… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 19 21:46:18 2018 +0000 wsdapi: Populate SOAP header structure. 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 | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index f67dc9e..c33c73b 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -31,6 +31,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); #define APP_MAX_DELAY 500 +static const WCHAR discoveryTo[] = { + 'u','r','n',':', + 's','c','h','e','m','a','s','-','x','m','l','s','o','a','p','-','o','r','g',':', + 'w','s',':','2','0','0','5',':','0','4',':', + 'd','i','s','c','o','v','e','r','y', 0 }; + +static const WCHAR actionHello[] = { + 'h','t','t','p',':','/','/', + 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', + 'w','s','/','2','0','0','5','/','0','4','/', + 'd','i','s','c','o','v','e','r','y','/', + 'H','e','l','l','o', 0 }; + +static BOOL create_guid(LPWSTR buffer) +{ + const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; + + WCHAR* uuidString = NULL; + UUID uuid; + + if (UuidCreate(&uuid) != RPC_S_OK) + return FALSE; + + UuidToStringW(&uuid, (RPC_WSTR*)&uuidString); + + if (uuidString == NULL) + return FALSE; + + wsprintfW(buffer, formatString, uuidString); + RpcStringFreeW((RPC_WSTR*)&uuidString); + + return TRUE; +} + +static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR action, LPCWSTR message_id, + WSD_APP_SEQUENCE *sequence, const WSDXML_ELEMENT *any_headers) +{ + ZeroMemory(header, sizeof(WSD_SOAP_HEADER)); + + header->To = to; + header->Action = action; + header->MessageID = message_id; + header->AppSequence = sequence; + header->AnyHeaders = (WSDXML_ELEMENT *)any_headers; + + /* TODO: Implement RelatesTo, ReplyTo, From, FaultTo */ +} + static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_HEADER *header, WSDXML_ELEMENT *body_element, struct list *discovered_namespaces, IWSDUdpAddress *remote_address, int max_initial_delay) { @@ -72,8 +120,24 @@ 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) { + WSD_SOAP_HEADER soapHeader; + WSD_APP_SEQUENCE sequence; + WCHAR message_id[64]; + HRESULT ret = E_OUTOFMEMORY; + + sequence.InstanceId = instance_id; + sequence.MessageNumber = msg_num; + sequence.SequenceId = session_id; + + if (!create_guid(message_id)) goto cleanup; + + populate_soap_header(&soapHeader, discoveryTo, actionHello, message_id, &sequence, hdr_any); + /* TODO: Populate message body */ /* Write and send the message */ - return write_and_send_message(impl, NULL, NULL, NULL, NULL, APP_MAX_DELAY); + ret = write_and_send_message(impl, &soapHeader, NULL, NULL, NULL, APP_MAX_DELAY); + +cleanup: + return ret; }

1 0

Owen Rudge : wsdapi: Add support for sending messages via UDP multicast.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 09612dd54d5bcfb75ce6d0c80edf8ab2449f5e69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09612dd54d5bcfb75ce6d0c8… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 19 21:46:13 2018 +0000 wsdapi: Add support for sending messages via UDP multicast. 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/Makefile.in | 3 +- dlls/wsdapi/discovery.c | 5 + dlls/wsdapi/network.c | 259 ++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/soap.c | 17 ++- dlls/wsdapi/tests/discovery.c | 4 +- dlls/wsdapi/wsdapi_internal.h | 6 + 6 files changed, 289 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09612dd54d5bcfb75ce6…

1 0

Owen Rudge : wsdapi: Add stub implementation of IWSDiscoveryPublisher_PublishEx.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 81e4dbcdac81c437f584520a997157f8c24eafce URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e4dbcdac81c437f584520a… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 19 21:46:08 2018 +0000 wsdapi: Add stub implementation of IWSDiscoveryPublisher_PublishEx. 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/Makefile.in | 1 + dlls/wsdapi/discovery.c | 40 +++++++++----------------- dlls/wsdapi/soap.c | 66 +++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi_internal.h | 24 ++++++++++++++++ 4 files changed, 105 insertions(+), 26 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 5c95351..155d004 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -8,4 +8,5 @@ C_SRCS = \ main.c \ memory.c \ msgparams.c \ + soap.c \ xml.c diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index 82a1ca0..7fa417b 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -23,30 +23,12 @@ #define COBJMACROS #define INITGUID -#include "windef.h" -#include "winbase.h" +#include "wsdapi_internal.h" #include "wine/debug.h" -#include "wine/list.h" -#include "objbase.h" #include "guiddef.h" -#include "wsdapi.h" WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); -struct notificationSink -{ - struct list entry; - IWSDiscoveryPublisherNotify *notificationSink; -}; - -typedef struct IWSDiscoveryPublisherImpl { - IWSDiscoveryPublisher IWSDiscoveryPublisher_iface; - LONG ref; - IWSDXMLContext *xmlContext; - DWORD addressFamily; - struct list notificationSinks; -} IWSDiscoveryPublisherImpl; - static inline IWSDiscoveryPublisherImpl *impl_from_IWSDiscoveryPublisher(IWSDiscoveryPublisher *iface) { return CONTAINING_RECORD(iface, IWSDiscoveryPublisherImpl, IWSDiscoveryPublisher_iface); @@ -200,10 +182,8 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_Publish(IWSDiscoveryPublisher *T ULONGLONG ullMessageNumber, LPCWSTR pszSessionId, const WSD_NAME_LIST *pTypesList, const WSD_URI_LIST *pScopesList, const WSD_URI_LIST *pXAddrsList) { - FIXME("(%p, %s, %s, %s, %s, %s, %p, %p, %p)\n", This, debugstr_w(pszId), wine_dbgstr_longlong(ullMetadataVersion), wine_dbgstr_longlong(ullInstanceId), - wine_dbgstr_longlong(ullMessageNumber), debugstr_w(pszSessionId), pTypesList, pScopesList, pXAddrsList); - - return E_NOTIMPL; + return IWSDiscoveryPublisher_PublishEx(This, pszId, ullMetadataVersion, ullInstanceId, ullMessageNumber, + pszSessionId, pTypesList, pScopesList, pXAddrsList, NULL, NULL, NULL, NULL, NULL); } static HRESULT WINAPI IWSDiscoveryPublisherImpl_UnPublish(IWSDiscoveryPublisher *This, LPCWSTR pszId, ULONGLONG ullInstanceId, ULONGLONG ullMessageNumber, @@ -248,13 +228,21 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_PublishEx(IWSDiscoveryPublisher const WSDXML_ELEMENT *pReferenceParameterAny, const WSDXML_ELEMENT *pPolicyAny, const WSDXML_ELEMENT *pEndpointReferenceAny, const WSDXML_ELEMENT *pAny) { - FIXME("(%p, %s, %s, %s, %s, %s, %p, %p, %p, %p, %p, %p, %p, %p)\n", This, debugstr_w(pszId), wine_dbgstr_longlong(ullMetadataVersion), + IWSDiscoveryPublisherImpl *impl = impl_from_IWSDiscoveryPublisher(This); + + TRACE("(%p, %s, %s, %s, %s, %s, %p, %p, %p, %p, %p, %p, %p, %p)\n", This, debugstr_w(pszId), wine_dbgstr_longlong(ullMetadataVersion), wine_dbgstr_longlong(ullInstanceId), wine_dbgstr_longlong(ullMessageNumber), debugstr_w(pszSessionId), pTypesList, pScopesList, pXAddrsList, pHeaderAny, pReferenceParameterAny, pPolicyAny, pEndpointReferenceAny, pAny); - return E_NOTIMPL; -} + if ((!impl->publisherStarted) || (pszId == NULL) || (lstrlenW(pszId) > WSD_MAX_TEXT_LENGTH) || + ((pszSessionId != NULL) && (lstrlenW(pszSessionId) > WSD_MAX_TEXT_LENGTH))) + { + return E_INVALIDARG; + } + return send_hello_message(impl, pszId, ullMetadataVersion, ullInstanceId, ullMessageNumber, pszSessionId, + pTypesList, pScopesList, pXAddrsList, pHeaderAny, pReferenceParameterAny, pEndpointReferenceAny, pAny); +} static HRESULT WINAPI IWSDiscoveryPublisherImpl_MatchProbeEx(IWSDiscoveryPublisher *This, const WSD_SOAP_MESSAGE *pProbeMessage, IWSDMessageParameters *pMessageParameters, LPCWSTR pszId, ULONGLONG ullMetadataVersion, diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c new file mode 100644 index 0000000..0cc2580 --- /dev/null +++ b/dlls/wsdapi/soap.c @@ -0,0 +1,66 @@ +/* + * Web Services on Devices + * + * Copyright 2017-2018 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <limits.h> + +#define COBJMACROS + +#include "wsdapi_internal.h" +#include "wine/debug.h" +#include "wine/heap.h" + +#define APP_MAX_DELAY 500 + +static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_HEADER *header, WSDXML_ELEMENT *body_element, + struct list *discovered_namespaces, IWSDUdpAddress *remote_address, int max_initial_delay) +{ + static const char xml_header[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; + ULONG xml_header_len = sizeof(xml_header) - 1; + char *full_xml; + + /* TODO: Create SOAP envelope */ + + /* Prefix the XML header */ + full_xml = heap_alloc(xml_header_len + 1); + + if (full_xml == NULL) + return E_OUTOFMEMORY; + + memcpy(full_xml, xml_header, xml_header_len); + full_xml[xml_header_len] = 0; + + /* TODO: Send the message */ + + heap_free(full_xml); + + return S_OK; +} + +HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLONG metadata_ver, ULONGLONG instance_id, + ULONGLONG msg_num, LPCWSTR session_id, const WSD_NAME_LIST *types_list, const WSD_URI_LIST *scopes_list, + 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) +{ + /* TODO: Populate message body */ + + /* Write and send the message */ + return write_and_send_message(impl, NULL, NULL, NULL, NULL, APP_MAX_DELAY); +} diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index 22de4a8..631dfb3 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -32,4 +32,28 @@ #define WSD_MAX_TEXT_LENGTH 8192 +/* discovery.c */ + +struct notificationSink +{ + struct list entry; + IWSDiscoveryPublisherNotify *notificationSink; +}; + +typedef struct IWSDiscoveryPublisherImpl { + IWSDiscoveryPublisher IWSDiscoveryPublisher_iface; + LONG ref; + IWSDXMLContext *xmlContext; + DWORD addressFamily; + struct list notificationSinks; + BOOL publisherStarted; +} IWSDiscoveryPublisherImpl; + +/* soap.c */ + +HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLONG metadata_ver, ULONGLONG instance_id, + ULONGLONG msg_num, LPCWSTR session_id, const WSD_NAME_LIST *types_list, const WSD_URI_LIST *scopes_list, + 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); + #endif

1 0

Owen Rudge : wsdapi: Add wsdapi_internal.h for shared internal function and macro definitions.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 597130d829169e0506945aefe3b148d05e075249 URL: https://source.winehq.org/git/wine.git/?a=commit;h=597130d829169e0506945aef… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 19 21:46:01 2018 +0000 wsdapi: Add wsdapi_internal.h for shared internal function and macro definitions. 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/address.c | 6 +----- dlls/wsdapi/wsdapi_internal.h | 35 +++++++++++++++++++++++++++++++++++ dlls/wsdapi/xml.c | 7 +------ 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index 8e9d475..d6be6a2 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -22,12 +22,8 @@ #define COBJMACROS -#include "winsock2.h" -#include "ws2tcpip.h" -#include "windef.h" -#include "winbase.h" +#include "wsdapi_internal.h" #include "wine/debug.h" -#include "wsdapi.h" WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h new file mode 100644 index 0000000..22de4a8 --- /dev/null +++ b/dlls/wsdapi/wsdapi_internal.h @@ -0,0 +1,35 @@ +/* + * Web Services on Devices + * Internal header + * + * Copyright 2017-2018 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINE_WSDAPI_INTERNAL_H +#define _WINE_WSDAPI_INTERNAL_H + +#include "winsock2.h" +#include "ws2tcpip.h" +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wsdapi.h" +#include "wine/list.h" + +#define WSD_MAX_TEXT_LENGTH 8192 + +#endif diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 824b7ff..4d6319c 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -22,16 +22,11 @@ #define COBJMACROS -#include "windef.h" -#include "winbase.h" +#include "wsdapi_internal.h" #include "wine/debug.h" -#include "wine/list.h" -#include "wsdapi.h" WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); -#define WSD_MAX_TEXT_LENGTH 8192 - static LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value) { int valueLen;

1 0

Louis Lenders : ntdll: Update version resource.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 670622b8fbb293466cfbd4c4ab3f802ed3586d75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=670622b8fbb293466cfbd4c4… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 19 20:38:44 2018 +0100 ntdll: Update version resource. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/version.rc b/dlls/ntdll/version.rc index c16ea4e..fd51d3c 100644 --- a/dlls/ntdll/version.rc +++ b/dlls/ntdll/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine ntdll" #define WINE_FILENAME_STR "ntdll.dll" -#define WINE_FILEVERSION 5,1,2600,2180 -#define WINE_FILEVERSION_STR "5.1.2600.2180" -#define WINE_PRODUCTVERSION 5,1,2600,2180 -#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" +#define WINE_FILEVERSION 6,1,7601,24059 +#define WINE_FILEVERSION_STR "6.1.7601.24059" +#define WINE_PRODUCTVERSION 6,1,7601,24059 +#define WINE_PRODUCTVERSION_STR "6.1.7601.24059" #include "wine/wine_common_ver.rc"

1 0

Gijs Vermeulen : advapi32/tests: Introduce ARRAY_SIZE macro.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 9702de20022ac962964aaf5f49eb9b786f03bd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9702de20022ac962964aaf5f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 19 20:22:31 2018 +0100 advapi32/tests: Introduce ARRAY_SIZE macro. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/cred.c | 4 +++- dlls/advapi32/tests/eventlog.c | 10 ++++++---- dlls/advapi32/tests/registry.c | 3 ++- dlls/advapi32/tests/security.c | 40 +++++++++++++++++++++------------------- 4 files changed, 32 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9702de20022ac962964a…

1 0

Gijs Vermeulen : advapi32: Introduce ARRAY_SIZE macro.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 89e2cf6b2b8b62ae70eeed3d41c5d62a721e92ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=89e2cf6b2b8b62ae70eeed3d… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 19 20:22:30 2018 +0100 advapi32: Introduce ARRAY_SIZE macro. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 2 ++ dlls/advapi32/cred.c | 12 ++++++------ dlls/advapi32/registry.c | 4 +--- dlls/advapi32/security.c | 22 +++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 4ced1e8..be3873a 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -25,6 +25,8 @@ #include "winnls.h" #include "wine/heap.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index df41421..49a1c34 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -248,7 +248,7 @@ static DWORD mac_read_credential_from_item(SecKeychainItemRef item, BOOL require SecKeychainAttributeList *attr_list; UInt32 info_tags[] = { kSecServiceItemAttr, kSecAccountItemAttr, kSecCommentItemAttr, kSecCreationDateItemAttr }; - info.count = sizeof(info_tags)/sizeof(info_tags[0]); + info.count = ARRAY_SIZE(info_tags); info.tag = info_tags; info.format = NULL; status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, &cred_blob_len, &cred_blob); @@ -641,12 +641,12 @@ static LPWSTR get_key_name_for_target(LPCWSTR target_name, DWORD type) if (type == CRED_TYPE_GENERIC) { prefix = wszGenericPrefix; - len += sizeof(wszGenericPrefix)/sizeof(wszGenericPrefix[0]); + len += ARRAY_SIZE(wszGenericPrefix); } else { prefix = wszDomPasswdPrefix; - len += sizeof(wszDomPasswdPrefix)/sizeof(wszDomPasswdPrefix[0]); + len += ARRAY_SIZE(wszDomPasswdPrefix); } key_name = heap_alloc(len * sizeof(WCHAR)); @@ -792,7 +792,7 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials UInt32 info_tags[] = { kSecServiceItemAttr }; BOOL match; - info.count = sizeof(info_tags)/sizeof(info_tags[0]); + info.count = ARRAY_SIZE(info_tags); info.tag = info_tags; info.format = NULL; status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); @@ -851,7 +851,7 @@ static DWORD mac_delete_credential(LPCWSTR TargetName) UInt32 info_tags[] = { kSecServiceItemAttr }; LPWSTR target_name; INT str_len; - info.count = sizeof(info_tags)/sizeof(info_tags[0]); + info.count = ARRAY_SIZE(info_tags); info.tag = info_tags; info.format = NULL; status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); @@ -1439,7 +1439,7 @@ BOOL WINAPI CredReadW(LPCWSTR TargetName, DWORD Type, DWORD Flags, PCREDENTIALW UInt32 info_tags[] = { kSecServiceItemAttr }; LPWSTR target_name; INT str_len; - info.count = sizeof(info_tags)/sizeof(info_tags[0]); + info.count = ARRAY_SIZE(info_tags); info.tag = info_tags; info.format = NULL; status = SecKeychainItemCopyAttributesAndData(item, &info, NULL, &attr_list, NULL, NULL); diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7a26fff..44b4bed 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -84,9 +84,7 @@ static const WCHAR * const root_key_names[] = name_DYN_DATA }; -#define NB_SPECIAL_ROOT_KEYS (sizeof(root_key_names)/sizeof(root_key_names[0])) - -static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; +static HKEY special_root_keys[ARRAY_SIZE(root_key_names)]; static BOOL hkcu_cache_disabled; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6f4fb44..f081b6b 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -964,7 +964,7 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, return FALSE; } - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) { + for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) { if (WellKnownSids[i].Type == WellKnownSidType) { DWORD length = GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); @@ -991,7 +991,7 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, return FALSE; } - for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownRids); i++) if (WellKnownRids[i].Type == WellKnownSidType) { UCHAR domain_subauth = *GetSidSubAuthorityCount(DomainSid); DWORD domain_sid_length = GetSidLengthRequired(domain_subauth); @@ -1028,7 +1028,7 @@ IsWellKnownSid( PSID pSid, WELL_KNOWN_SID_TYPE WellKnownSidType ) unsigned int i; TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) if (WellKnownSids[i].Type == WellKnownSidType) if (EqualSid(pSid, (PSID)&(WellKnownSids[i].Sid.Revision))) return TRUE; @@ -2252,7 +2252,7 @@ LookupAccountSidW( /* check the well known SIDs first */ for (i = 0; i <= WinAccountProtectedUsersSid; i++) { if (IsWellKnownSid(sid, i)) { - for (j = 0; j < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); j++) { + for (j = 0; j < ARRAY_SIZE(ACCOUNT_SIDS); j++) { if (ACCOUNT_SIDS[j].type == i) { ac = ACCOUNT_SIDS[j].account; dm = ACCOUNT_SIDS[j].domain; @@ -2937,7 +2937,7 @@ BOOL lookup_local_wellknown_name( const LSA_UNICODE_STRING *account_and_domain, *handled = FALSE; split_domain_account( account_and_domain, &account, &domain ); - for (i = 0; i < sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0]); i++) + for (i = 0; i < ARRAY_SIZE(ACCOUNT_SIDS); i++) { /* check domain first */ if (domain.Buffer && !match_domain( i, &domain )) continue; @@ -4926,7 +4926,7 @@ static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) static BOOL DumpSid(PSID psid, WCHAR **pwptr, ULONG *plen) { size_t i; - for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) { if (WellKnownSids[i].wstr[0] && EqualSid(psid, (PSID)&(WellKnownSids[i].Sid.Revision))) { @@ -4983,7 +4983,7 @@ static void DumpRights(DWORD mask, WCHAR **pwptr, ULONG *plen) return; /* first check if the right have name */ - for (i = 0; i < sizeof(AceRights)/sizeof(AceRights[0]); i++) + for (i = 0; i < ARRAY_SIZE(AceRights); i++) { if (AceRights[i].wstr == NULL) break; @@ -5633,11 +5633,11 @@ static DWORD ComputeStringSidSize(LPCWSTR StringSid) { unsigned int i; - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) return GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); - for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownRids); i++) if (!strncmpW(WellKnownRids[i].wstr, StringSid, 2)) { MAX_SID local; @@ -5740,7 +5740,7 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) unsigned int i; pisid->Revision = SDDL_REVISION; - for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownSids); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) { DWORD j; @@ -5751,7 +5751,7 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) bret = TRUE; } - for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + for (i = 0; i < ARRAY_SIZE(WellKnownRids); i++) if (!strncmpW(WellKnownRids[i].wstr, StringSid, 2)) { ADVAPI_GetComputerSid(pisid);

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
79
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 March 2018