June 2017 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices: Add a static builtin dictionary.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 5154290ac0ee8943b0f6295c7885b3b9dd6c976d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5154290ac0ee8943b0f6295c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:26 2017 +0200 webservices: Add a static builtin dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/reader.c | 253 +---------- dlls/webservices/string.c | 767 +++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 15 +- dlls/webservices/webservices_private.h | 4 + 5 files changed, 795 insertions(+), 245 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5154290ac0ee8943b0f62…

1 0

Paul Gofman : d3dx9: Add const qualifier to regstore_set_values() input data.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 607ae76ada6bbf1602341ef9e9702a8eb4859b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=607ae76ada6bbf1602341ef9e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 12 14:22:01 2017 +0300 d3dx9: Add const qualifier to regstore_set_values() input data. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 126f3cc..e9c8387 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -368,7 +368,7 @@ static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, get_reg_offset(table, start_offset + count - 1)); } -static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, void *data, +static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, const void *data, unsigned int start_offset, unsigned int count) { if (!count)

1 0

Alistair Leslie-Hughes : oleaut32: Improve support for IDispatch in VarCat.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 538e46adea88a3d6bdadd7f762eb620cd11cbeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=538e46adea88a3d6bdadd7f76… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 13 22:35:06 2017 +0000 oleaut32: Improve support for IDispatch in VarCat. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 20 ++++++-- dlls/oleaut32/variant.c | 103 ++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 47 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index a271c50..d8a6ebf 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6093,7 +6093,7 @@ static void test_VarCat(void) SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); CHECK_CALLED(dispatch_invoke); @@ -6108,7 +6108,7 @@ static void test_VarCat(void) SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == S_OK, "got 0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); ok(V_VT(&result) == VT_BSTR, "got %d\n", V_VT(&result)); ok(SysStringLen(V_BSTR(&result)) == 0, "got %d\n", SysStringLen(V_BSTR(&result))); CHECK_CALLED(dispatch_invoke); @@ -6140,7 +6140,21 @@ static void test_VarCat(void) SET_EXPECT(dispatch_invoke); hres = VarCat(&left, &right, &result); - todo_wine ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + ok(hres == E_OUTOFMEMORY, "got 0x%08x\n", hres); + CHECK_CALLED(dispatch_invoke); + + VariantClear(&left); + VariantClear(&right); + VariantClear(&result); + + init_test_dispatch(VT_NULL, &dispatch); + dispatch.result = DISP_E_TYPEMISMATCH; + V_VT(&right) = VT_DISPATCH; + V_DISPATCH(&right) = &dispatch.IDispatch_iface; + + SET_EXPECT(dispatch_invoke); + hres = VarCat(&left, &right, &result); + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); CHECK_CALLED(dispatch_invoke); VariantClear(&left); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2dcded5..ee203d7 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -515,6 +515,22 @@ static inline HRESULT VARIANT_CoerceArray(VARIANTARG* pd, VARIANTARG* ps, VARTYP return DISP_E_TYPEMISMATCH; } +static HRESULT VARIANT_FetchDispatchValue(LPVARIANT pvDispatch, LPVARIANT pValue) +{ + HRESULT hres; + static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; + + if ((V_VT(pvDispatch) & VT_TYPEMASK) == VT_DISPATCH) { + if (NULL == V_DISPATCH(pvDispatch)) return DISP_E_TYPEMISMATCH; + hres = IDispatch_Invoke(V_DISPATCH(pvDispatch), DISPID_VALUE, &IID_NULL, + LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &emptyParams, pValue, + NULL, NULL); + } else { + hres = DISP_E_TYPEMISMATCH; + } + return hres; +} + /****************************************************************************** * Check if a variants type is valid. */ @@ -2503,7 +2519,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { VARTYPE leftvt,rightvt,resultvt; HRESULT hres; - static const WCHAR sz_empty[] = {'\0'}; + leftvt = V_VT(left); rightvt = V_VT(right); @@ -2581,64 +2597,79 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) else { VARIANT bstrvar_left, bstrvar_right; + VARIANT *tmp; + VARIANT fetched; + V_VT(out) = VT_BSTR; VariantInit(&bstrvar_left); VariantInit(&bstrvar_right); + VariantInit(&fetched); /* Convert left side variant to string */ if (leftvt != VT_BSTR) { - /* Fill with empty string for later concat with right side */ - if (leftvt == VT_NULL) + tmp = left; + + if(leftvt == VT_DISPATCH) { - V_VT(&bstrvar_left) = VT_BSTR; - V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); + hres = VARIANT_FetchDispatchValue(left, &fetched); + if(FAILED(hres)) + goto failed; + + tmp = &fetched; } - else + + hres = VariantChangeTypeEx(&bstrvar_left,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); + VariantClear(&fetched); + if (hres == DISP_E_TYPEMISMATCH) { - hres = VariantChangeTypeEx(&bstrvar_left,left,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - if (hres != S_OK) { - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return hres; - } + V_VT(&bstrvar_left) = VT_BSTR; + V_BSTR(&bstrvar_left) = SysAllocStringLen(NULL, 0); } + else if(hres != S_OK) + goto failed; } /* convert right side variant to string */ if (rightvt != VT_BSTR) { - /* Fill with empty string for later concat with right side */ - if (rightvt == VT_NULL) + tmp = right; + + if(rightvt == VT_DISPATCH) { - V_VT(&bstrvar_right) = VT_BSTR; - V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); + hres = VARIANT_FetchDispatchValue(right, &fetched); + if(FAILED(hres)) + goto failed; + + tmp = &fetched; } - else + + hres = VariantChangeTypeEx(&bstrvar_right,tmp,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); + VariantClear(&fetched); + if (hres == DISP_E_TYPEMISMATCH) { - hres = VariantChangeTypeEx(&bstrvar_right,right,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); - if (hres != S_OK) { - VariantClear(&bstrvar_left); - VariantClear(&bstrvar_right); - return hres; - } + V_VT(&bstrvar_right) = VT_BSTR; + V_BSTR(&bstrvar_right) = SysAllocStringLen(NULL, 0); } + else if(hres != S_OK) + goto failed; } /* Concat the resulting strings together */ if (leftvt == VT_BSTR && rightvt == VT_BSTR) - VarBstrCat (V_BSTR(left), V_BSTR(right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(left), V_BSTR(right), &V_BSTR(out)); else if (leftvt != VT_BSTR && rightvt != VT_BSTR) - VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(&bstrvar_right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(&bstrvar_right), &V_BSTR(out)); else if (leftvt != VT_BSTR && rightvt == VT_BSTR) - VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(&bstrvar_left), V_BSTR(right), &V_BSTR(out)); else if (leftvt == VT_BSTR && rightvt != VT_BSTR) - VarBstrCat (V_BSTR(left), V_BSTR(&bstrvar_right), &V_BSTR(out)); + hres = VarBstrCat (V_BSTR(left), V_BSTR(&bstrvar_right), &V_BSTR(out)); +failed: VariantClear(&bstrvar_left); VariantClear(&bstrvar_right); - return S_OK; + return hres; } } @@ -2865,22 +2896,6 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags) #undef _VARCMP } -static HRESULT VARIANT_FetchDispatchValue(LPVARIANT pvDispatch, LPVARIANT pValue) -{ - HRESULT hres; - static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; - - if ((V_VT(pvDispatch) & VT_TYPEMASK) == VT_DISPATCH) { - if (NULL == V_DISPATCH(pvDispatch)) return DISP_E_TYPEMISMATCH; - hres = IDispatch_Invoke(V_DISPATCH(pvDispatch), DISPID_VALUE, &IID_NULL, - LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &emptyParams, pValue, - NULL, NULL); - } else { - hres = DISP_E_TYPEMISMATCH; - } - return hres; -} - /********************************************************************** * VarAnd [OLEAUT32.142] *

1 0

Daniel Lehman : msvcrt: Support rethrowing SEH exceptions.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 66b65474d1106c0e5ee07b9cc097b3d0f731df79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b65474d1106c0e5ee07b9cc… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:59:19 2017 +0200 msvcrt: Support rethrowing SEH exceptions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index df99153..7e9c38d 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -118,6 +118,7 @@ typedef struct { ULONG64 dest_frame; ULONG64 orig_frame; + EXCEPTION_RECORD *seh_rec; DISPATCHER_CONTEXT *dispatch; const cxx_function_descr *descr; } se_translator_ctx; @@ -350,6 +351,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) ULONG64 frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4]; + EXCEPTION_RECORD *untrans_rec = (void*)rec->ExceptionInformation[6]; void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5]; int *unwind_help = rva_to_ptr(descr->unwind_help, frame); cxx_catch_ctx ctx; @@ -370,8 +372,17 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); ctx.rethrow = TRUE; - RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, - prev_rec->NumberParameters, prev_rec->ExceptionInformation); + if (untrans_rec) + { + __DestructExceptionObject(prev_rec); + RaiseException(untrans_rec->ExceptionCode, untrans_rec->ExceptionFlags, + untrans_rec->NumberParameters, untrans_rec->ExceptionInformation); + } + else + { + RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, + prev_rec->NumberParameters, prev_rec->ExceptionInformation); + } } __ENDTRY } @@ -384,12 +395,12 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) static inline BOOL cxx_is_consolidate(const EXCEPTION_RECORD *rec) { - return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && + return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==7 && rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block; } -static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, - DISPATCHER_CONTEXT *dispatch, +static inline void find_catch_block(EXCEPTION_RECORD *rec, EXCEPTION_RECORD *untrans_rec, + ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, cxx_exception_type *info, ULONG64 orig_frame) { @@ -465,7 +476,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, memset(&catch_record, 0, sizeof(catch_record)); catch_record.ExceptionCode = STATUS_UNWIND_CONSOLIDATE; catch_record.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - catch_record.NumberParameters = 6; + catch_record.NumberParameters = 7; catch_record.ExceptionInformation[0] = (ULONG_PTR)call_catch_block; catch_record.ExceptionInformation[1] = orig_frame; catch_record.ExceptionInformation[2] = (ULONG_PTR)descr; @@ -473,6 +484,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, catch_record.ExceptionInformation[4] = (ULONG_PTR)rec; catch_record.ExceptionInformation[5] = (ULONG_PTR)rva_to_ptr(catchblock->handler, dispatch->ImageBase); + catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &context, NULL); } } @@ -493,7 +505,7 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) } exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; - find_catch_block(rec, ctx->dest_frame, ctx->dispatch, + find_catch_block(rec, ctx->seh_rec, ctx->dest_frame, ctx->dispatch, ctx->descr, exc_type, ctx->orig_frame); __DestructExceptionObject(rec); @@ -590,6 +602,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, ctx.dest_frame = frame; ctx.orig_frame = orig_frame; + ctx.seh_rec = rec; ctx.dispatch = dispatch; ctx.descr = descr; __TRY @@ -605,7 +618,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } } - find_catch_block(rec, frame, dispatch, descr, exc_type, orig_frame); + find_catch_block(rec, NULL, frame, dispatch, descr, exc_type, orig_frame); return ExceptionContinueSearch; }

1 0

Daniel Lehman : msvcrt: Clean up registered C++ objects in handler.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 57266eec5e6e8f3f064e24fa21b7e0bd92a2f1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57266eec5e6e8f3f064e24fa2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:58:45 2017 +0200 msvcrt: Clean up registered C++ objects in handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 62 +++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index baacc94..fffabbb 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -110,6 +110,12 @@ typedef struct __cxx_function_descr typedef struct { + cxx_frame_info frame_info; + BOOL rethrow; +} cxx_catch_ctx; + +typedef struct +{ ULONG64 dest_frame; ULONG64 orig_frame; DISPATCHER_CONTEXT *dispatch; @@ -318,17 +324,27 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, unwind_help[0] = last_level; } -static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs) +static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) { EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; + thread_data_t *data = msvcrt_get_thread_data(); + cxx_catch_ctx *ctx = c; if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) return EXCEPTION_EXECUTE_HANDLER; + if (rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]) + ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; } +static void CALLBACK cxx_catch_cleanup(BOOL normal, void *c) +{ + cxx_catch_ctx *ctx = c; + __CxxUnregisterExceptionObject(&ctx->frame_info, ctx->rethrow); +} + static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) { ULONG64 frame = rec->ExceptionInformation[1]; @@ -336,25 +352,31 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4]; void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5]; int *unwind_help = rva_to_ptr(descr->unwind_help, frame); - cxx_frame_info frame_info; + cxx_catch_ctx ctx; void *ret_addr = NULL; TRACE("calling handler %p\n", handler); - __CxxRegisterExceptionObject(&prev_rec, &frame_info); + ctx.rethrow = FALSE; + __CxxRegisterExceptionObject(&prev_rec, &ctx.frame_info); __TRY { - ret_addr = handler(0, frame); - } - __EXCEPT(cxx_rethrow_filter) - { - TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + __TRY + { + ret_addr = handler(0, frame); + } + __EXCEPT_CTX(cxx_rethrow_filter, &ctx) + { + TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + ctx.rethrow = TRUE; - RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, - prev_rec->NumberParameters, prev_rec->ExceptionInformation); + RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, + prev_rec->NumberParameters, prev_rec->ExceptionInformation); + } + __ENDTRY } - __ENDTRY - __CxxUnregisterExceptionObject(&frame_info, FALSE); + __FINALLY_CTX(cxx_catch_cleanup, &ctx) + unwind_help[0] = -2; unwind_help[1] = -1; return ret_addr; @@ -534,10 +556,6 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, { if (cxx_is_consolidate(rec)) { - EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; - thread_data_t *data = msvcrt_get_thread_data(); - frame_info *cur; - if (rec->ExceptionFlags & EH_TARGET_UNWIND) { const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; @@ -548,18 +566,6 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } else if(frame == orig_frame) cxx_local_unwind(frame, dispatch, descr, -1); - - /* FIXME: we should only unregister frames registered by call_catch_block here */ - for (cur = data->frame_info_head; cur; cur = cur->next) - { - if ((ULONG64)cur <= frame) - { - __CxxUnregisterExceptionObject((cxx_frame_info*)cur, - new_rec->ExceptionCode == CXX_EXCEPTION && - data->exc_record->ExceptionCode == CXX_EXCEPTION && - new_rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]); - } - } return ExceptionContinueSearch; }

1 0

Hans Leidekker : webservices: Support more text record types in the reader.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 14c1cd97e5e6ac9bcf0190bbef891a434b60b8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c1cd97e5e6ac9bcf0190bbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:27 2017 +0200 webservices: Support more text record types in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 334 ++++++++++++++++++++++++++++++--- dlls/webservices/webservices_private.h | 11 ++ dlls/webservices/writer.c | 20 +- 3 files changed, 330 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14c1cd97e5e6ac9bcf019…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 4d8585c761cdb804e605c214e88228a219b78eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8585c761cdb804e605c214e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Jun 14 08:17:46 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 37cd887..846f694 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-06 08:51+0300\n" +"PO-Revision-Date: 2017-06-14 08:17+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12261,7 +12261,7 @@ msgstr "Ar tikrai norite pašalinti registro raktą „%1“ ir visus jo porakč #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Išskleidžia arba suskleidžia pasirinktą mazgą" #: regedit.rc:231 msgid "Collapse"

1 0

Hans Leidekker : webservices: Implement WsReadXmlBuffer.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 83bdbc1e386afe59c026c1156b77e3bc5797bbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bdbc1e386afe59c026c1156… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 14 11:07:30 2017 +0200 webservices: Implement WsReadXmlBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 69 +++++++++++++ dlls/webservices/tests/reader.c | 198 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 269 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83bdbc1e386afe59c026c…

1 0

Jacek Caban : wininet/tests: Fixed potential buffer overflow (coverity).
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 19cb65b156a77f0cac09ed755abea50febb2e0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19cb65b156a77f0cac09ed755… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 14 11:43:51 2017 +0200 wininet/tests: Fixed potential buffer overflow (coverity). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8bb925f..a3a0980 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5212,7 +5212,7 @@ static void test_redirect(int port) "Content-Length: 0\r\n" "\r\n"); - size = server_read_data(buf, sizeof(buf)); + size = server_read_data(buf, sizeof(buf) - 1); buf[size] = 0; p = strstr(buf, "\r\n"); if(p) *p = 0;

1 0

Daniel Lehman : msvcrt: Only unwind current catch block when handling nested exception.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: f1d307cae5eb72e6f1ec3fd3faaf3bcbb08f4692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d307cae5eb72e6f1ec3fd3f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:59:05 2017 +0200 msvcrt: Only unwind current catch block when handling nested exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index fffabbb..df99153 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -306,7 +306,7 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, } TRACE("current level: %d, last level: %d\n", trylevel, last_level); - while (trylevel != last_level) + while (trylevel > last_level) { if (trylevel<0 || trylevel>=descr->unwind_count) { @@ -321,7 +321,7 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, } trylevel = unwind_table[trylevel].prev; } - unwind_help[0] = last_level; + unwind_help[0] = trylevel; } static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) @@ -512,6 +512,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, DWORD throw_func_off; void *throw_func; UINT i, j; + int unwindlevel = -1; if (descr->magic<CXX_FRAME_MAGIC_VC6 || descr->magic>CXX_FRAME_MAGIC_VC8) { @@ -545,6 +546,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rva_to_ptr(catchblock->handler, dispatch->ImageBase) == throw_func) { TRACE("nested exception detected\n"); + unwindlevel = tryblock->end_level; orig_frame = *(ULONG64*)rva_to_ptr(catchblock->frame, frame); TRACE("setting orig_frame to %lx\n", orig_frame); } @@ -554,23 +556,11 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { - if (cxx_is_consolidate(rec)) - { - if (rec->ExceptionFlags & EH_TARGET_UNWIND) - { - const cxx_function_descr *orig_descr = (void*)rec->ExceptionInformation[2]; - int end_level = rec->ExceptionInformation[3]; - orig_frame = rec->ExceptionInformation[1]; - - cxx_local_unwind(orig_frame, dispatch, orig_descr, end_level); - } - else if(frame == orig_frame) - cxx_local_unwind(frame, dispatch, descr, -1); - return ExceptionContinueSearch; - } - - if (frame == orig_frame) - cxx_local_unwind(frame, dispatch, descr, rec->ExceptionFlags & EH_TARGET_UNWIND ? trylevel : -1); + if (rec->ExceptionFlags & EH_TARGET_UNWIND) + cxx_local_unwind(orig_frame, dispatch, descr, + cxx_is_consolidate(rec) ? rec->ExceptionInformation[3] : trylevel); + else + cxx_local_unwind(orig_frame, dispatch, descr, unwindlevel); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch;

1 0