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

Daniel Lehman : msvcrt: Only unwind current catch block when handling nested exception.
by Alexandre Julliard 14 Jun '17

14 Jun '17

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

Daniel Lehman : msvcrt: Support rethrowing SEH exceptions.
by Alexandre Julliard 14 Jun '17

14 Jun '17

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

Alistair Leslie-Hughes : oleaut32: Improve support for IDispatch in VarCat.
by Alexandre Julliard 14 Jun '17

14 Jun '17

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

Francois Gouget : testbot/TestLauncher: The str*_s() functions are not portable. Avoid them.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: tools Branch: master Commit: 814671cfc719a5980b513bdb61cbe7e012934644 URL: http://source.winehq.org/git/tools.git/?a=commit;h=814671cfc719a5980b513bdb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 10:42:43 2017 +0200 testbot/TestLauncher: The str*_s() functions are not portable. Avoid them. They are missing in older versions of msvcrt, on Windows XP for instance. Also, simply mapping strncpy_s() to strncpy() means the string will not be NUL-terminated! The destination buffers are large enough anyway so use the regular string functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index ed7fffb..53590f8 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -19,13 +19,9 @@ */ #include <stdio.h> +#include <errno.h> #include <windows.h> -#ifdef __MINGW32__ -#define strcpy_s(dest, size, src) strcpy((dest), (src)) -#define strncpy_s(dest, size, src, max) strncpy((dest), (src), (max)) -#define strcat_s(dest, size, src) strcat((dest), (src)) -#endif #define countof(Array) (sizeof(Array) / sizeof(Array[0])) static unsigned Failures = 0; @@ -339,9 +335,12 @@ int main(int argc, char *argv[]) if (Suffix == NULL) Suffix = strchr(TestExeFileName, '.'); if (Suffix == NULL) - strcpy_s(TestName, countof(TestName), TestExeFileName); + strcpy(TestName, TestExeFileName); else - strncpy_s(TestName, _MAX_PATH, TestExeFileName, Suffix - TestExeFileName); + { + strncpy(TestName, TestExeFileName, Suffix - TestExeFileName); + TestName[Suffix - TestExeFileName] = '\0'; + } Subtest = (Arg + 1 < argc ? argv[Arg + 1] : ""); CommandLen = strlen(TestExeFullName) + 3; @@ -356,13 +355,13 @@ int main(int argc, char *argv[]) } CommandLine[0] = '"'; - strcpy_s(CommandLine + 1, CommandLen - 1, TestExeFullName); - strcat_s(CommandLine, CommandLen, "\""); + strcpy(CommandLine + 1, TestExeFullName); + strcat(CommandLine, "\""); for (TestArg = Arg + 1; TestArg < argc; TestArg++) { - strcat_s(CommandLine, CommandLen, " \""); - strcat_s(CommandLine, CommandLen, argv[TestArg]); - strcat_s(CommandLine, CommandLen, "\""); + strcat(CommandLine, " \""); + strcat(CommandLine, argv[TestArg]); + strcat(CommandLine, "\""); } Arg = argc;

1 0

Francois Gouget : testbot: Update the TestLauncher binaries when updating Wine.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: tools Branch: master Commit: 0fd8f624e7a2888d5ba19959405da436053e8ac2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0fd8f624e7a2888d5ba19959… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 09:50:45 2017 +0200 testbot: Update the TestLauncher binaries when updating Wine. And remove the checked-in TestLauncher binaries since we no longer need them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 13 +++++++++++++ testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/windows/TestLauncher32.exe | Bin 432844 -> 0 bytes testbot/bin/windows/TestLauncher64.exe | Bin 115348 -> 0 bytes 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c99c1ab..135a5c3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -376,6 +376,19 @@ elsif (!defined $TAError) if ($NewStatus eq "completed") { use File::Copy; + for my $Bitness ("32", "64") + { + Debug(Elapsed($Start), " Retrieving the $Bitness bit TestLauncher to '$TaskDir/TestLauncher$Bitness.exe'\n"); + if ($TA->GetFile("../src/TestLauncher/TestLauncher$Bitness.exe", "$TaskDir/TestLauncher$Bitness.exe")) + { + copy "$TaskDir/TestLauncher$Bitness.exe", "$DataDir/latest/TestLauncher$Bitness.exe"; + } + elsif (!defined $TAError) + { + $TAError = "An error occurred while retrieving the $Bitness bit TestLauncher: ". $TA->GetLastError(); + } + } + Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n"); if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt")) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index cd74119..22339b7 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -362,8 +362,8 @@ my $IsWineTest = 1; if ($Step->Type eq "single") { my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; - Debug(Elapsed($Start), " Sending '$BinDir/windows/$TestLauncher'\n"); - if (!$TA->SendFile("$BinDir/windows/$TestLauncher", $TestLauncher, 0)) + Debug(Elapsed($Start), " Sending 'latest/$TestLauncher'\n"); + if (!$TA->SendFile("$DataDir/latest/$TestLauncher", $TestLauncher, 0)) { FatalTAError($TA, "Could not copy TestLauncher to the VM"); } diff --git a/testbot/bin/windows/TestLauncher32.exe b/testbot/bin/windows/TestLauncher32.exe deleted file mode 100755 index 3272652..0000000 Binary files a/testbot/bin/windows/TestLauncher32.exe and /dev/null differ diff --git a/testbot/bin/windows/TestLauncher64.exe b/testbot/bin/windows/TestLauncher64.exe deleted file mode 100755 index f18a904..0000000 Binary files a/testbot/bin/windows/TestLauncher64.exe and /dev/null differ

1 0

Francois Gouget : winetest/dissect: Better check the task report.
by Alexandre Julliard 14 Jun '17

14 Jun '17

Module: tools Branch: master Commit: ab725dad3b8b3076847aeaf06e94a89c8fb125e5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ab725dad3b8b3076847aeaf0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 10:47:10 2017 +0200 winetest/dissect: Better check the task report. This makes the dissect analysis match the expected results on the report test. In particular it now leverages the pid traces to detect when a test has no test summary line for its main process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 437 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 334 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=ab725dad3b8b3076847a…

1 0

Hugh McMaster : regedit: Add status bar text for the 'Expand'/'Collapse' menu item.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: a726343fa5a7bb2589dc014ff865fed39bb8f6a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a726343fa5a7bb2589dc014ff… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:43:10 2017 +0000 regedit: Add status bar text for the 'Expand'/'Collapse' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 184 ++++++++++++++++++++++---------------------- po/bg.po | 184 ++++++++++++++++++++++---------------------- po/ca.po | 184 ++++++++++++++++++++++---------------------- po/cs.po | 184 ++++++++++++++++++++++---------------------- po/da.po | 184 ++++++++++++++++++++++---------------------- po/de.po | 184 ++++++++++++++++++++++---------------------- po/el.po | 184 ++++++++++++++++++++++---------------------- po/en.po | 184 ++++++++++++++++++++++---------------------- po/en_US.po | 184 ++++++++++++++++++++++---------------------- po/eo.po | 184 ++++++++++++++++++++++---------------------- po/es.po | 184 ++++++++++++++++++++++---------------------- po/fa.po | 184 ++++++++++++++++++++++---------------------- po/fi.po | 184 ++++++++++++++++++++++---------------------- po/fr.po | 184 ++++++++++++++++++++++---------------------- po/he.po | 184 ++++++++++++++++++++++---------------------- po/hi.po | 184 ++++++++++++++++++++++---------------------- po/hr.po | 184 ++++++++++++++++++++++---------------------- po/hu.po | 184 ++++++++++++++++++++++---------------------- po/it.po | 184 ++++++++++++++++++++++---------------------- po/ja.po | 184 ++++++++++++++++++++++---------------------- po/ko.po | 184 ++++++++++++++++++++++---------------------- po/lt.po | 184 ++++++++++++++++++++++---------------------- po/ml.po | 184 ++++++++++++++++++++++---------------------- po/nb_NO.po | 184 ++++++++++++++++++++++---------------------- po/nl.po | 184 ++++++++++++++++++++++---------------------- po/or.po | 184 ++++++++++++++++++++++---------------------- po/pa.po | 184 ++++++++++++++++++++++---------------------- po/pl.po | 184 ++++++++++++++++++++++---------------------- po/pt_BR.po | 184 ++++++++++++++++++++++---------------------- po/pt_PT.po | 184 ++++++++++++++++++++++---------------------- po/rm.po | 184 ++++++++++++++++++++++---------------------- po/ro.po | 184 ++++++++++++++++++++++---------------------- po/ru.po | 184 ++++++++++++++++++++++---------------------- po/sk.po | 184 ++++++++++++++++++++++---------------------- po/sl.po | 184 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 184 ++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 184 ++++++++++++++++++++++---------------------- po/sv.po | 184 ++++++++++++++++++++++---------------------- po/te.po | 184 ++++++++++++++++++++++---------------------- po/th.po | 184 ++++++++++++++++++++++---------------------- po/tr.po | 184 ++++++++++++++++++++++---------------------- po/uk.po | 184 ++++++++++++++++++++++---------------------- po/wa.po | 184 ++++++++++++++++++++++---------------------- po/wine.pot | 184 ++++++++++++++++++++++---------------------- po/zh_CN.po | 184 ++++++++++++++++++++++---------------------- po/zh_TW.po | 184 ++++++++++++++++++++++---------------------- programs/regedit/regedit.rc | 1 + 47 files changed, 4325 insertions(+), 4140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a726343fa5a7bb2589dc0…

1 0

André Hentschel : winebuild: Emit relay debugging thunks for ARM64.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: eed3bb6dfd52a4e520bd9e2d86ed186b9f3cc688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed3bb6dfd52a4e520bd9e2d8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 12 20:30:43 2017 +0200 winebuild: Emit relay debugging thunks for ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index f3feb0f..39733b2 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -84,7 +84,9 @@ static int has_relays( DLLSPEC *spec ) { int i; - if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64 && target_cpu != CPU_ARM) return 0; + if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64 && + target_cpu != CPU_ARM && target_cpu != CPU_ARM64) + return 0; for (i = spec->base; i <= spec->limit; i++) { @@ -242,6 +244,41 @@ static void output_relay_debug( DLLSPEC *spec ) break; } + case CPU_ARM64: + switch (args) + { + default: + case 8: + case 7: output( "\tstp x6, x7, [SP,#-16]!\n" ); + /* fall through */ + case 6: + case 5: output( "\tstp x4, x5, [SP,#-16]!\n" ); + /* fall through */ + case 4: + case 3: output( "\tstp x2, x3, [SP,#-16]!\n" ); + /* fall through */ + case 2: + case 1: output( "\tstp x0, x1, [SP,#-16]!\n" ); + /* fall through */ + case 0: break; + } + output( "\tstp x29, x30, [SP,#-16]!\n" ); + output( "\tstp x8, x9, [SP,#-16]!\n" ); + output( "\tmov x2, SP\n"); + if (odp->flags & FLAG_RET64) flags |= 1; + output( "\tmov w1, #%u\n", (flags << 24) ); + if (args) output( "\tadd w1, w1, #%u\n", (args << 16) ); + if (i - spec->base) output( "\tadd w1, w1, #%u\n", i - spec->base ); + output( "\tldr x0, 1f\n"); + output( "\tldr x3, [x0, #8]\n"); + output( "\tblr x3\n"); + output( "\tadd SP, SP, #16\n" ); + output( "\tldp x29, x30, [SP], #16\n" ); + if (args) output( "\tadd SP, SP, #%u\n", 8 * ((min(args, 8) + 1) & 0xe) ); + output( "\tret\n"); + output( "\t1: .quad .L__wine_spec_relay_descr\n"); + break; + case CPU_x86_64: output( "\tsubq $40,%%rsp\n" ); output_cfi( ".cfi_adjust_cfa_offset 40" );

1 0

Zebediah Figura : include: Pack WAVEFORMAT structs.
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: d31d656b6f16572025d297b010eba13390deeb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31d656b6f16572025d297b01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 12 14:36:35 2017 -0500 include: Pack WAVEFORMAT structs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 13 +++++++++++++ include/mmreg.h | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 13494a6..44a6feb 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1139,6 +1139,18 @@ static void test_acmFormatSuggest(void) ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); } +static void test_acmFormatTagDetails(void) +{ + ACMFORMATTAGDETAILSW aftd = {0}; + MMRESULT rc; + + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = WAVE_FORMAT_MPEGLAYER3; + rc = acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (rc == MMSYSERR_NOERROR) + ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); +} + static struct { struct @@ -1306,6 +1318,7 @@ START_TEST(msacm) driver_tests(); test_prepareheader(); test_acmFormatSuggest(); + test_acmFormatTagDetails(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd(); diff --git a/include/mmreg.h b/include/mmreg.h index 2ee2b00..8bb581d 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -23,6 +23,8 @@ #ifndef __WINE_MMREG_H #define __WINE_MMREG_H +#include <pshpack1.h> + /*********************************************************************** * Defines/Enums */ @@ -512,6 +514,8 @@ typedef struct tagEXBMINFOHEADER { #endif +#include <poppack.h> + #endif /* __WINE_MMREG_H */ #else /* __WIDL__ */

1 0

Zebediah Figura : winemp3.acm: Fix error in acmStreamSize().
by Alexandre Julliard 13 Jun '17

13 Jun '17

Module: wine Branch: master Commit: ffebb919101120feb55cef43bf48e1d142693ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffebb919101120feb55cef43b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 12 14:36:36 2017 -0500 winemp3.acm: Fix error in acmStreamSize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index cc6008d..13a6109 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -940,11 +940,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) { nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); - if (nblocks == 0) - return ACMERR_NOTPOSSIBLE; if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nBlockAlign * 1152)) /* Round block count up. */ nblocks++; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; adss->cbDstLength = 3000 + nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || @@ -952,11 +952,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { nblocks = adss->cbSrcLength / (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec); - if (nblocks == 0) - return ACMERR_NOTPOSSIBLE; if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec)) /* Round block count up. */ nblocks++; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; adss->cbDstLength = nblocks * 1152 * adsi->pwfxDst->nBlockAlign; } else

1 0