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

Piotr Caban : ucrtbase: Add __current_exception_context() implementation.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: f82af4d2bbf9672580c70d904c7e67212839620c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f82af4d2bbf9672580c70d90… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 20 15:36:43 2018 +0100 ucrtbase: Add __current_exception_context() 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 | 25 ++++++++++++++++------ dlls/msvcrt/except_i386.c | 10 ++++++--- dlls/msvcrt/except_x86_64.c | 20 ++++++++++------- dlls/msvcrt/msvcrt.h | 5 +++-- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 7 files changed, 43 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f82af4d2bbf9672580c7…

1 0

Piotr Caban : ucrtbase: Add __processing_throw implementation.
by Alexandre Julliard March 20, 2018

March 20, 2018

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 March 20, 2018

March 20, 2018

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 March 20, 2018

March 20, 2018

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 : mshtml: Check if BSC is still attached to window before using it in OnRedirectVerifyCallback.
by Alexandre Julliard March 20, 2018

March 20, 2018

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

Henri Verbeet : wined3d: Merge wined3d_surface_upload_data() into texture2d_upload_data().
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: a9cf391bedf572dead08d3eea45eaed13c172f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9cf391bedf572dead08d3ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 20 15:29:58 2018 +0330 wined3d: Merge wined3d_surface_upload_data() into texture2d_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 170 ++--------------------------------------- dlls/wined3d/texture.c | 149 +++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 5 -- 3 files changed, 154 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9cf391bedf572dead08…

1 0

Owen Rudge : wsdapi: Implement writing of XML elements.
by Alexandre Julliard March 20, 2018

March 20, 2018

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 March 20, 2018

March 20, 2018

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

Alex Henrie : user32/tests: Drop broadcast test workaround for Windows NT4.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 096deddb2ed7ff3233964018cab830eac43cec2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=096deddb2ed7ff3233964018… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Mar 18 23:26:20 2018 -0600 user32/tests: Drop broadcast test workaround for Windows NT4. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/broadcast.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 5869119..afdb536 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -138,26 +138,21 @@ if (0) /* TODO: Check the hang flags */ SetLastError( 0xdeadbeef ); recips = BSM_APPLICATIONS; ret = broadcast( BSF_POSTMESSAGE|BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, 0 ); - if (ret) - { - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_OBJECT_0, "Synchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(ret==1, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - - recips = BSM_APPLICATIONS; - ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); - ok(!ret, "Returned: %d\n", ret); - ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - PulseEvent(hevent); - } - else /* BSF_SENDNOTIFYMESSAGE not supported on NT4 */ - ok( GetLastError() == ERROR_INVALID_PARAMETER, "failed with err %u\n", GetLastError() ); + ok(ret==1, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_OBJECT_0, "Synchronous message sent instead\n"); + PulseEvent(hevent); + + recips = BSM_APPLICATIONS; + ret = broadcast( BSF_SENDNOTIFYMESSAGE, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); + ok(ret==1, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + PulseEvent(hevent); + + recips = BSM_APPLICATIONS; + ret = broadcast( BSF_SENDNOTIFYMESSAGE|BSF_QUERY, &recips, WM_NULL, 100, BROADCAST_QUERY_DENY ); + ok(!ret, "Returned: %d\n", ret); + ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); + PulseEvent(hevent); recips = BSM_APPLICATIONS; ret = broadcast( 0, &recips, WM_NULL, 100, 0 );

1 0

Henri Verbeet : wined3d: Allow wined3d_texture_upload_data() to upload to WINED3D_LOCATION_TEXTURE_SRGB.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 17c7f8e3c3e4e6ebe4b8b0b73e91c98f279491b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c7f8e3c3e4e6ebe4b8b0b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 20 15:29:57 2018 +0330 wined3d: Allow wined3d_texture_upload_data() to upload to WINED3D_LOCATION_TEXTURE_SRGB. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/texture.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b08e91b..f7ae3be 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2121,7 +2121,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, dst_texture->resource.format, &op->src_box, wined3d_const_bo_address(&addr), - row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front); + row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front, FALSE); wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2216,8 +2216,8 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_bind_and_dirtify(texture, context, FALSE); wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); - wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, - &src_box, &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front); + wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, &src_box, + &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front, FALSE); wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 551d9fd..29bcfb1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1747,19 +1747,19 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { texture->texture_ops->texture_upload_data(texture, sub_resource_idx, context, - format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z); + format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - format, src_box, row_pitch, dst_x, dst_y, FALSE, data); + format, src_box, row_pitch, dst_x, dst_y, srgb, data); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -2392,7 +2392,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { unsigned int level = sub_resource_idx % texture->level_count; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2402,9 +2402,9 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int void *converted_mem = NULL; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " - "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u.\n", + "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u, srgb %#x.\n", texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), - data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z); + data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); if (src_box) { @@ -2520,7 +2520,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0); + NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); heap_free(data.addr); } @@ -2546,8 +2546,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, - texture->resource.format, NULL, &data, row_pitch, slice_pitch, 0, 0, 0); + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -2555,8 +2555,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, - texture->resource.format, NULL, &data, row_pitch, slice_pitch, 0, 0, 0); + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e48f82a..580f35a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3086,7 +3086,7 @@ struct wined3d_texture_ops void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, - unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); + unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); }; @@ -3287,7 +3287,7 @@ void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *tex void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) DECLSPEC_HIDDEN; + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN;

1 0