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

Piotr Caban : ucrtbase: Add __processing_throw implementation.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 9999c59c486b2e6d724a95a63fcfbfc1ce46df9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9999c59c486b2e6d724a95a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 20 15:36:48 2018 +0100 ucrtbase: Add __processing_throw implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/except.c | 9 +++++++++ dlls/msvcrt/except_i386.c | 6 ++++-- dlls/msvcrt/except_x86_64.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 7 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index af23f8d..9ddb5dd 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -40,7 +40,7 @@ @ stub __intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex -@ stub __processing_throw +@ cdecl __processing_throw() ucrtbase.__processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 286c82f..b99c98b 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -528,4 +528,13 @@ void** CDECL __current_exception_context(void) return (void**)&msvcrt_get_thread_data()->ctx_record; } +/********************************************************************* + * __processing_throw (UCRTBASE.@) + */ +int* CDECL __processing_throw(void) +{ + TRACE("()\n"); + return &msvcrt_get_thread_data()->processing_throw; +} + #endif /* _MSVCR_VER>=140 */ diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 09dec65..5121301 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -412,8 +412,9 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, struct catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; DWORD save_esp = ((DWORD*)frame)[-1]; - thread_data_t *data; + thread_data_t *data = msvcrt_get_thread_data(); + data->processing_throw++; for (i = 0; i < descr->tryblock_count; i++) { const tryblock_info *tryblock = &descr->tryblock[i]; @@ -456,11 +457,11 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, cxx_local_unwind( frame, descr, tryblock->start_level ); frame->trylevel = tryblock->end_level + 1; - data = msvcrt_get_thread_data(); nested_frame.frame_info.rec = data->exc_record; nested_frame.frame_info.context = data->ctx_record; data->exc_record = rec; data->ctx_record = context; + data->processing_throw--; /* call the catch block */ TRACE( "calling catch block %p addr %p ebp %p\n", @@ -483,6 +484,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, continue_after_catch( frame, addr ); } } + data->processing_throw--; } /********************************************************************* diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 7859a63..77c519d 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -363,6 +363,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) ctx.rethrow = FALSE; __CxxRegisterExceptionObject(&ep, &ctx.frame_info); + msvcrt_get_thread_data()->processing_throw--; __TRY { __TRY @@ -410,12 +411,14 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, CONTEXT *context, ULONG64 exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); int trylevel = ip_to_state(rva_to_ptr(descr->ipmap, dispatch->ImageBase), descr->ipmap_count, dispatch->ControlPc-dispatch->ImageBase); + thread_data_t *data = msvcrt_get_thread_data(); const tryblock_info *in_catch; EXCEPTION_RECORD catch_record; CONTEXT ctx; UINT i, j; INT *unwind_help; + data->processing_throw++; for (i=descr->tryblock_count; i>0; i--) { in_catch = rva_to_ptr(descr->tryblock, dispatch->ImageBase); @@ -494,6 +497,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, CONTEXT *context, } TRACE("no matching catch block found\n"); + data->processing_throw--; } static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7c48917..6b0f425 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -260,6 +260,7 @@ struct __thread_data { int unk7; EXCEPTION_RECORD *exc_record; CONTEXT *ctx_record; + int processing_throw; frame_info *frame_info_head; void *unk8[6]; LCID cached_lcid; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2d4f798..ff33d86 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -135,7 +135,7 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -@ stub __processing_throw +@ cdecl __processing_throw() @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ stub __report_gsfailure diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 252113c..d304de6 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -34,7 +34,7 @@ @ cdecl __current_exception_context() ucrtbase.__current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex -@ stub __processing_throw +@ cdecl __processing_throw() ucrtbase.__processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy

1 0

Piotr Caban : msvcrt: Fix __uncaught_exception implementation.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 36a88ac2e14a4bdcec1f855dc497dc9397283689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36a88ac2e14a4bdcec1f855d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 20 15:36:54 2018 +0100 msvcrt: Fix __uncaught_exception implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index b99c98b..8fccd8e 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -293,7 +293,7 @@ int CDECL _abnormal_termination(void) */ BOOL CDECL MSVCRT___uncaught_exception(void) { - return FALSE; + return msvcrt_get_thread_data()->processing_throw != 0; } #if _MSVCR_VER>=70 && _MSVCR_VER<=71

1 0

Piotr Caban : msvcp140: Add __uncaught_exceptions implementation.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: c07ade82ed1259d60758308b1df5358016cd3f28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c07ade82ed1259d60758308b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 20 15:37:00 2018 +0100 msvcp140: Add __uncaught_exceptions implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/exception.c | 7 +++++++ dlls/msvcp90/msvcp90.h | 4 ++++ dlls/msvcp90/msvcp_main.c | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 4fc8e3c..ddf8ba7 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3513,7 +3513,7 @@ @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl ?uncaught_exception(a)std@@YA_NXZ() MSVCP__uncaught_exception -@ stub ?uncaught_exceptions(a)std@@YAHXZ +@ cdecl ?uncaught_exceptions(a)std@@YAHXZ() __uncaught_exceptions @ cdecl -arch=arm ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAAHXZ(ptr) basic_streambuf_char_underflow @ thiscall -arch=i386 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_underflow diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7d9ade8..e7ba3d7 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -944,6 +944,13 @@ MSVCP_bool __cdecl MSVCP__uncaught_exception(void) return __uncaught_exception(); } +#if _MSVCP_VER >= 140 +int __cdecl __uncaught_exceptions(void) +{ + return *UCRTBASE___processing_throw(); +} +#endif + #if _MSVCP_VER >= 70 || defined(_MSVCIRT) #define EXCEPTION_VTABLE(name,funcs) __ASM_VTABLE(name,funcs) #else diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index d751186..16eaa48 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -47,6 +47,10 @@ extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void (__cdecl *MSVCRT_operator_delete)(void*); extern void* (__cdecl *MSVCRT_set_new_handler)(void*); +#if _MSVCP_VER >= 140 +extern int* (__cdecl *UCRTBASE___processing_throw)(void); +#endif + #if _MSVCP_VER >= 110 /* keep in sync with msvcrt/lock.c */ typedef struct cs_queue diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 22baeef..7aef4cd 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -60,6 +60,10 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*); +#if _MSVCP_VER >= 140 +int* (__cdecl *UCRTBASE___processing_throw)(void); +#endif + #if _MSVCP_VER >= 110 critical_section* (__thiscall *critical_section_ctor)(critical_section*); void (__thiscall *critical_section_dtor)(critical_section*); @@ -147,6 +151,7 @@ static void init_cxx_funcs(void) MSVCRT_operator_new = operator_new; MSVCRT_operator_delete = operator_delete; MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "_set_new_handler"); + UCRTBASE___processing_throw = (void*)GetProcAddress(hmod, "__processing_throw"); hcon = LoadLibraryA( CONCRT_NAME(_MSVCP_VER) ); if (!hcon) FIXME( "%s not loaded\n", CONCRT_NAME(_MSVCP_VER) );

1 0

Jacek Caban : vbscript/tests: Added named item ref count tests.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: a4824803da7b0e1dea7034003db62e1a6a2ff956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4824803da7b0e1dea703400… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 20 22:37:44 2018 +0100 vbscript/tests: Added named item ref count tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9172add..6b57540 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -974,6 +974,18 @@ static IDispatchExVtbl RefObjVtbl = { static IDispatchEx RefObj = { &RefObjVtbl }; +static ULONG global_ref; + +static ULONG WINAPI Global_AddRef(IDispatchEx *iface) +{ + return ++global_ref; +} + +static ULONG WINAPI Global_Release(IDispatchEx *iface) +{ + return --global_ref; +} + static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "ok")) { @@ -1476,8 +1488,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, static IDispatchExVtbl GlobalVtbl = { DispatchEx_QueryInterface, - DispatchEx_AddRef, - DispatchEx_Release, + Global_AddRef, + Global_Release, DispatchEx_GetTypeInfoCount, DispatchEx_GetTypeInfo, DispatchEx_GetIDsOfNames, @@ -1619,6 +1631,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC ok(0, "unexpected pstrName %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&Global; + IUnknown_AddRef(*ppiunkItem); return S_OK; } @@ -1814,6 +1827,7 @@ static void test_parse_context(void) static const WCHAR xW[] = {'x',0}; static const WCHAR yW[] = {'y',0}; + global_ref = 1; engine = create_and_init_script(0); if(!engine) return; @@ -1855,6 +1869,7 @@ static void test_parse_context(void) IActiveScriptParse_Release(parser); close_script(engine); + ok(global_ref == 1, "global_ref = %u\n", global_ref); } static void parse_script_a(const char *src)

1 0

Jacek Caban : mshtml: Check if BSC is still attached to window before using it in OnRedirectVerifyCallback.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: cfb67712ce35c05d6b7d27ece84c9192e66290b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfb67712ce35c05d6b7d27ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 20 22:39:01 2018 +0100 mshtml: Check if BSC is still attached to window before using it in OnRedirectVerifyCallback. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9d6076d..cd18287 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1231,7 +1231,7 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_OnRedirectVerifyCallback(nsI ERR("AddRequest failed: %08x\n", nsres); } - if(This->bsc->is_doc_channel) { + if(This->bsc->is_doc_channel && This->bsc->bsc.window && This->bsc->bsc.window->base.outer_window) { IUri *uri = nsuri_get_uri(This->nschannel->uri); if(uri) {

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: 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 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: Store discovered namespaces and write xmlns attributes for them.
by Alexandre Julliard 20 Mar '18

20 Mar '18

Module: wine Branch: master Commit: 402fce157901e0c51bf109a2c4b98632b3f74e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=402fce157901e0c51bf109a2… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 19 21:46:38 2018 +0000 wsdapi: Store discovered namespaces and write xmlns attributes for them. 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 | 67 +++++++++++++++++++++++++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 8 ++++-- dlls/wsdapi/wsdapi_internal.h | 4 +++ dlls/wsdapi/xml.c | 2 +- 4 files changed, 74 insertions(+), 7 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index abea33c..40edd15 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -71,6 +71,13 @@ 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 }; +struct discovered_namespace +{ + struct list entry; + LPCWSTR prefix; + LPCWSTR uri; +}; + static char *wide_to_utf8(LPCWSTR wide_string, int *length) { char *new_string = NULL; @@ -252,6 +259,31 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac /* TODO: Implement RelatesTo, ReplyTo, From, FaultTo */ } +static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE *discovered_ns) +{ + struct discovered_namespace *ns; + + LIST_FOR_EACH_ENTRY(ns, namespaces, struct discovered_namespace, entry) + { + if (lstrcmpW(ns->uri, discovered_ns->Uri) == 0) + return TRUE; /* Already added */ + } + + ns = WSDAllocateLinkedMemory(namespaces, sizeof(struct discovered_namespace)); + + if (ns == NULL) + return FALSE; + + ns->prefix = duplicate_string(ns, discovered_ns->PreferredPrefix); + ns->uri = duplicate_string(ns, discovered_ns->Uri); + + if ((ns->prefix == NULL) || (ns->uri == NULL)) + return FALSE; + + list_add_tail(namespaces, &ns->entry); + return TRUE; +} + static WSDXML_ELEMENT *create_soap_header_xml_elements(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header) { WSDXML_ELEMENT *header_element = NULL, *app_sequence_element = NULL; @@ -309,9 +341,10 @@ cleanup: 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; + WS_XML_STRING *actual_envelope_prefix = NULL, *envelope_uri_xmlstr = NULL, *tmp_prefix = NULL, *tmp_uri = NULL; WSDXML_NAMESPACE *addressing_ns = NULL, *discovery_ns = NULL, *envelope_ns = NULL; WSDXML_ELEMENT *header_element = NULL; + struct discovered_namespace *ns; WS_XML_BUFFER *buffer = NULL; WS_XML_WRITER *writer = NULL; WS_XML_STRING envelope; @@ -320,10 +353,13 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER /* Create the necessary XML prefixes */ if (FAILED(IWSDXMLContext_AddNamespace(xml_context, addressingNsUri, addressingPrefix, &addressing_ns))) goto cleanup; + if (!add_discovered_namespace(discovered_namespaces, addressing_ns)) goto cleanup; if (FAILED(IWSDXMLContext_AddNamespace(xml_context, discoveryNsUri, discoveryPrefix, &discovery_ns))) goto cleanup; + if (!add_discovered_namespace(discovered_namespaces, discovery_ns)) goto cleanup; if (FAILED(IWSDXMLContext_AddNamespace(xml_context, envelopeNsUri, envelopePrefix, &envelope_ns))) goto cleanup; + if (!add_discovered_namespace(discovered_namespaces, envelope_ns)) goto cleanup; envelope.bytes = envelopeString; envelope.length = sizeof(envelopeString) - 1; @@ -356,6 +392,23 @@ 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; + LIST_FOR_EACH_ENTRY(ns, discovered_namespaces, struct discovered_namespace, entry) + { + tmp_prefix = populate_xml_string(ns->prefix); + tmp_uri = populate_xml_string(ns->uri); + + if ((tmp_prefix == NULL) || (tmp_uri == NULL)) goto cleanup; + + ret = WsWriteXmlnsAttribute(writer, tmp_prefix, tmp_uri, FALSE, NULL); + if (FAILED(ret)) goto cleanup; + + free_xml_string(tmp_prefix); + free_xml_string(tmp_uri); + } + + tmp_prefix = NULL; + tmp_uri = NULL; + /* Write the header */ if (!write_xml_element(header_element, writer)) goto cleanup; @@ -401,7 +454,7 @@ static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_ char *full_xml; HRESULT ret; - ret = create_soap_envelope(impl->xmlContext, header, NULL, &heap, &xml, &xml_length, NULL); + ret = create_soap_envelope(impl->xmlContext, header, NULL, &heap, &xml, &xml_length, discovered_namespaces); if (ret != S_OK) return ret; /* Prefix the XML header */ @@ -439,6 +492,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) { + struct list *discoveredNamespaces = NULL; WSD_SOAP_HEADER soapHeader; WSD_APP_SEQUENCE sequence; WCHAR message_id[64]; @@ -450,13 +504,20 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON if (!create_guid(message_id)) goto cleanup; + discoveredNamespaces = WSDAllocateLinkedMemory(NULL, sizeof(struct list)); + if (!discoveredNamespaces) goto cleanup; + + list_init(discoveredNamespaces); + populate_soap_header(&soapHeader, discoveryTo, actionHello, message_id, &sequence, hdr_any); /* TODO: Populate message body */ /* Write and send the message */ - ret = write_and_send_message(impl, &soapHeader, NULL, NULL, NULL, APP_MAX_DELAY); + ret = write_and_send_message(impl, &soapHeader, NULL, discoveredNamespaces, NULL, APP_MAX_DELAY); cleanup: + WSDFreeLinkedMemory(discoveredNamespaces); + return ret; } diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index d81dcdc..563c33c 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -506,6 +506,7 @@ static void Publish_tests(void) messageStorage *msgStorage; WSADATA wsaData; BOOL messageOK; + BOOL hello_message_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; @@ -595,8 +596,8 @@ static void Publish_tests(void) msg = msgStorage->messages[i]; messageOK = FALSE; - messageOK = (strstr(msg, "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Hello</wsa:Action>") != NULL); - messageOK = messageOK && (strstr(msg, endpointReferenceString) != NULL); + hello_message_seen = (strstr(msg, "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Hello</wsa:Action>") != NULL); + messageOK = hello_message_seen && (strstr(msg, endpointReferenceString) != NULL); messageOK = messageOK && (strstr(msg, "<wsd:AppSequence InstanceId=\"1\" MessageNumber=\"1\"></wsd:AppSequence>") != NULL); messageOK = messageOK && (strstr(msg, "<wsd:MetadataVersion>1</wsd:MetadataVersion>") != NULL); @@ -610,7 +611,8 @@ static void Publish_tests(void) heap_free(msgStorage); - todo_wine ok(messageOK == TRUE, "Hello message not received\n"); + ok(hello_message_seen == TRUE, "Hello message not received\n"); + todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n"); after_publish_test: diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index 417eed9..47dde6b 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -62,4 +62,8 @@ 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); +/* xml.c */ + +LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value); + #endif diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 4d6319c..fc02d8b 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); -static LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value) +LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value) { int valueLen; LPWSTR dup;

1 0

Nikolay Sivov : comdlg32: Use memory allocation helpers.
by Alexandre Julliard 20 Mar '18

20 Mar '18

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