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

Re: ntdll: On macOS, don't use clock_gettime() even if it's available.
by Michael Müller June 1, 2017

June 1, 2017

Not sure which one of two commands is causing the lower overhead, but shouldn't you just build Wine using the 10.11 SDK if you plan to deploy it on 10.11? This could theoretically also apply to other parts of Wine and I don't think it makes sense to add backwards compatibility hacks everywhere. Regards, Michael

2 1

Re: [PATCH] msacm32: Correctly allocate WAVEFORMATEX.
by Andrew Eikum June 1, 2017

June 1, 2017

This doesn't look right to me. According to MSDN[1], the cbFormatSize field should already be the full size of the format struct. It's possible MSDN is wrong, but we'd need tests to prove that first. Who sets cbFormatSize? Could the error be there? [1] https://msdn.microsoft.com/en-us/library/windows/desktop/dd742918(v=vs.85).… Andrew On Wed, May 31, 2017 at 06:03:58PM -0500, Zebediah Figura wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=26388 > > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/msacm32/format.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c > index de07cba9a3..ec46cae163 100644 > --- a/dlls/msacm32/format.c > +++ b/dlls/msacm32/format.c > @@ -75,7 +75,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, > > afd.cbStruct = sizeof(afd); > afd.dwFormatTag = paftd->dwFormatTag; > - afd.pwfx = HeapAlloc(MSACM_hHeap, 0, paftd->cbFormatSize); > + afd.pwfx = HeapAlloc(MSACM_hHeap, 0, sizeof(WAVEFORMATEX) + paftd->cbFormatSize); > if (!afd.pwfx) return FALSE; > afd.pwfx->wFormatTag = paftd->dwFormatTag; > afd.pwfx->cbSize = paftd->cbFormatSize; > -- > 2.13.0 > > >

1 0

Re: PATCH 1/7] msvcrt: Translate SEH exception on each call to __CxxFrameHandler.
by Piotr Caban May 31, 2017

May 31, 2017

On 05/24/17 02:54, Daniel Lehman wrote: > +extern void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record, > + void (*target)(void) ); It's already defined in wine/exception.h. > +extern void CDECL __DestructExceptionObject(EXCEPTION_RECORD *rec); This is also already defined (in msvcrt.h) > + > +static void DECLSPEC_NORETURN seh_unwind_target(void) > +{ > + seh_frame_info *seh_frame = (seh_frame_info *)__wine_get_frame(); > + __wine_pop_frame( &seh_frame->frame ); There's no need to call __wine_pop_frame here, it will be done after the jump anyway. I think that the whole series will be cleaner/easier to read if we add the __EXCEPT_CTX/__FINALLY_CTX macros and use them here. I'm attaching a patch with proposition of changes for this functions. With such changes your patch will look like this (this is not tested): typedef struct { ULONG64 dest_frame; ULONG64 orig_frame; DISPATCHER_CONTEXT *dispatch; const cxx_function_descr *descr; } se_translator_ctx; static DWORD se_translation_filter(EXCEPTION_POINTERS *ep, void *c) { se_translator_ctx *ctx = (se_translator_ctx*)c; /* this is copied from original patch but I think that */ /* terminate should be called on non C++ exceptions here */ if (ep->rec->ExceptionCode != CXX_EXCEPTION) return ExceptionContinueSearch; find_catch_block(...); __DestructExceptionObject(ep->rec); return ExceptionExecuteHandler; } in cxx_frame_handler: if (data->se_translator) { se_translator_ctx ctx; //initialize ctx __TRY { except_ptrs.ExceptionRecord = rec; except_ptrs.ContextRecord = context; data->se_translator(rec->ExceptionCode, &except_ptrs); } __EXCEPT_CTX(se_translation_filter, &ctx) { } __END_TRY } With such changes second patch can be also changed to use __TRY/__FINALLY_CTX around "ret_addr = handler(0, frame);" file. What do you think about it? Thanks, Piotr

2 1