March 2018 - Wine-Commits - list.winehq.org

Nikolay Sivov : comdlg32: Use memory allocation helpers.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 38898e939c77853499035c5a5afc5833b05eb4d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38898e939c77853499035c5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 20 10:37:47 2018 +0300 comdlg32: Use memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/cdlg32.c | 22 ++++---- dlls/comdlg32/colordlg.c | 17 +++--- dlls/comdlg32/filedlg.c | 140 ++++++++++++++++++++-------------------------- dlls/comdlg32/filedlg31.c | 55 +++++++++--------- dlls/comdlg32/finddlg.c | 5 +- dlls/comdlg32/fontdlg.c | 13 +++-- 6 files changed, 122 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=38898e939c7785349903…

1 0

Dmitry Timoshkov : avifil32: Correct threading model on interfaces.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 57a8a33a7cfdf9f52c03f6407a0831538a662cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a8a33a7cfdf9f52c03f640… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Mar 17 10:19:14 2018 +0000 avifil32: Correct threading model on interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/avifil32.idl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/avifil32.idl b/dlls/avifil32/avifil32.idl index 1f50f15..420cbb9 100644 --- a/dlls/avifil32/avifil32.idl +++ b/dlls/avifil32/avifil32.idl @@ -22,35 +22,35 @@ [ helpstring("Microsoft AVI Files"), - threading(apartment), + threading(both), uuid(00020000-0000-0000-C000-000000000046) ] coclass AVIFile { interface IAVIFile; } [ helpstring("AVI Compressed Stream"), - threading(apartment), + threading(both), uuid(00020001-0000-0000-c000-000000000046) ] coclass ICMStream { interface IAVIStream; } [ helpstring("Microsoft Wave File"), - threading(apartment), + threading(both), uuid(00020003-0000-0000-c000-000000000046) ] coclass WAVFile { interface IAVIFile; } [ helpstring("IAVIStream & IAVIFile Proxy"), - threading(apartment), + threading(both), uuid(0002000d-0000-0000-c000-000000000046) ] coclass AVIProxy { } [ helpstring("ACM Compressed Audio Stream"), - threading(apartment), + threading(both), uuid(0002000f-0000-0000-c000-000000000046) ] coclass ACMStream { interface IAVIStream; }

1 0

Austin English : kernel32: Add GetNumaNodeProcessorMaskEx stub.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 252752f8d99497ae6b1a5ca227fb56e69743a299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=252752f8d99497ae6b1a5ca2… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 19 14:15:59 2018 -0500 kernel32: Add GetNumaNodeProcessorMaskEx stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3a0bef9..aae22eb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -746,7 +746,7 @@ @ stdcall GetNumaHighestNodeNumber(ptr) # @ stub GetNumaNodeNumberFromHandle @ stdcall GetNumaNodeProcessorMask(long ptr) -# @ stub GetNumaNodeProcessorMaskEx +@ stdcall GetNumaNodeProcessorMaskEx(long ptr) # @ stub GetNumaProcessorMap @ stdcall GetNumaProcessorNode(long ptr) # @ stub GetNumaProcessorNodeEx diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4798100..47f1cfb 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4019,6 +4019,16 @@ BOOL WINAPI GetNumaNodeProcessorMask(UCHAR node, PULONGLONG mask) } /********************************************************************** + * GetNumaNodeProcessorMaskEx (KERNEL32.@) + */ +BOOL WINAPI GetNumaNodeProcessorMaskEx(USHORT node, PGROUP_AFFINITY mask) +{ + FIXME("(%hu %p): stub\n", node, mask); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/********************************************************************** * GetNumaAvailableMemoryNode (KERNEL32.@) */ BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR node, PULONGLONG available_bytes) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e152c88..fd4e8d4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -575,7 +575,7 @@ @ stdcall GetNativeSystemInfo(ptr) kernel32.GetNativeSystemInfo # @ stub GetNextFgPolicyRefreshInfoInternal @ stdcall GetNumaHighestNodeNumber(ptr) kernel32.GetNumaHighestNodeNumber -# @ stub GetNumaNodeProcessorMaskEx +@ stdcall GetNumaNodeProcessorMaskEx(long ptr) kernel32.GetNumaNodeProcessorMaskEx # @ stub GetNumaProximityNodeEx @ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) kernel32.GetNumberFormatEx @ stdcall GetNumberFormatW(long long wstr ptr ptr long) kernel32.GetNumberFormatW

1 0

Owen Rudge : wsdapi: Populate SOAP header structure.
by Alexandre Julliard March 20, 2018

March 20, 2018

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 wsdapi_internal.h for shared internal function and macro definitions.
by Alexandre Julliard March 20, 2018

March 20, 2018

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

Owen Rudge : wsdapi: Add support for sending messages via UDP multicast.
by Alexandre Julliard March 20, 2018

March 20, 2018

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

Gijs Vermeulen : advapi32/tests: Introduce ARRAY_SIZE macro.
by Alexandre Julliard March 20, 2018

March 20, 2018

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

Owen Rudge : wsdapi: Add stub implementation of IWSDiscoveryPublisher_PublishEx.
by Alexandre Julliard March 20, 2018

March 20, 2018

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

Louis Lenders : ntdll: Update version resource.
by Alexandre Julliard March 20, 2018

March 20, 2018

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: Introduce ARRAY_SIZE macro.
by Alexandre Julliard March 20, 2018

March 20, 2018

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