October 2022 - Wine-commits

Paul Gofman : msvcp140: Import __ExceptionPtrCopy implementation.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: c590c6b78837e0c2f557376ebfb649a1a7084b54 URL: https://gitlab.winehq.org/wine/wine/-/commit/c590c6b78837e0c2f557376ebfb649… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 11 15:33:19 2022 -0500 msvcp140: Import __ExceptionPtrCopy implementation. --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/exception.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 232a2b959a2..241dd4eed2c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1693,8 +1693,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z -@ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z -@ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy +@ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z(ptr) __ExceptionPtrCreate diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index effe57063a1..89465d7578d 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1013,6 +1013,21 @@ void __cdecl __ExceptionPtrDestroy(exception_ptr *ep) HeapFree(GetProcessHeap(), 0, ep->ref); } } + +/********************************************************************* + * ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z + * ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z + */ +void __cdecl __ExceptionPtrCopy(exception_ptr *ep, const exception_ptr *copy) +{ + TRACE("(%p %p)\n", ep, copy); + + /* don't destroy object stored in ep */ + *ep = *copy; + if (ep->ref) + InterlockedIncrement(copy->ref); +} + #endif #if _MSVCP_VER >= 70 || defined(_MSVCIRT)

1 0

Paul Gofman : msvcp140: Import __ExceptionPtrAssign implementation.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 95b8a3a1c93e1fe1ad2913c22f98c4f9b9719bb8 URL: https://gitlab.winehq.org/wine/wine/-/commit/95b8a3a1c93e1fe1ad2913c22f98c4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 11 15:36:36 2022 -0500 msvcp140: Import __ExceptionPtrAssign implementation. --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/exception.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 241dd4eed2c..388dfbaf38c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1689,8 +1689,8 @@ @ stub ?_Xregex_error(a)std@@YAXW4error_type(a)regex_constants@1@@Z @ cdecl -arch=win32 ?_Xruntime_error(a)std@@YAXPBD(a)Z(str) _Xruntime_error @ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) _Xruntime_error -@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 89465d7578d..fb605dedcae 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1028,6 +1028,22 @@ void __cdecl __ExceptionPtrCopy(exception_ptr *ep, const exception_ptr *copy) InterlockedIncrement(copy->ref); } +/********************************************************************* + * ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z + * ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z + */ +void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign) +{ + TRACE("(%p %p)\n", ep, assign); + + /* don't destroy object stored in ep */ + if (ep->ref) + InterlockedDecrement(ep->ref); + + *ep = *assign; + if (ep->ref) + InterlockedIncrement(ep->ref); +} #endif #if _MSVCP_VER >= 70 || defined(_MSVCIRT)

1 0

Paul Gofman : msvcp140: Import __ExceptionPtrRethrow implementation.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 58c0d78485a3341df993f92d1d0f10acc60646de URL: https://gitlab.winehq.org/wine/wine/-/commit/58c0d78485a3341df993f92d1d0f10… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 11 15:39:56 2022 -0500 msvcp140: Import __ExceptionPtrRethrow implementation. --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/exception.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 388dfbaf38c..09672daf681 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1703,8 +1703,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPEAX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX(a)Z(ptr) __ExceptionPtrDestroy @ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX(a)Z(ptr) __ExceptionPtrDestroy -@ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPBX(a)Z -@ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX(a)Z(ptr) __ExceptionPtrRethrow +@ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX(a)Z diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index fb605dedcae..62a15073320 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1044,6 +1044,29 @@ void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign if (ep->ref) InterlockedIncrement(ep->ref); } + +/********************************************************************* + * ?__ExceptionPtrRethrow@@YAXPBX(a)Z + * ?__ExceptionPtrRethrow@@YAXPEBX(a)Z + */ +void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) +{ + TRACE("(%p)\n", ep); + + if (!ep->rec) + { + static const char *exception_msg = "bad exception"; + exception e; + + MSVCP_exception_ctor(&e, &exception_msg); + _CxxThrowException(&e, &exception_cxx_type); + return; + } + + RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & (~EH_UNWINDING), + ep->rec->NumberParameters, ep->rec->ExceptionInformation); +} + #endif #if _MSVCP_VER >= 70 || defined(_MSVCIRT)

1 0

Paul Gofman : msvcp140: Import __ExceptionPtrCurrentException implementation.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 23dd3b27e42f5d657e30adf259729b2b2da25e91 URL: https://gitlab.winehq.org/wine/wine/-/commit/23dd3b27e42f5d657e30adf259729b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 11 15:44:40 2022 -0500 msvcp140: Import __ExceptionPtrCurrentException implementation. --- dlls/msvcp140/msvcp140.spec | 4 +- dlls/msvcp90/exception.c | 149 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 09672daf681..6a63f546625 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1699,8 +1699,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z(ptr) __ExceptionPtrCreate @ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z(ptr) __ExceptionPtrCreate -@ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPAX(a)Z -@ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPEAX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) __ExceptionPtrCurrentException +@ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z(ptr) __ExceptionPtrCurrentException @ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX(a)Z(ptr) __ExceptionPtrDestroy @ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX(a)Z(ptr) __ExceptionPtrDestroy @ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX(a)Z(ptr) __ExceptionPtrRethrow diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 62a15073320..9da49dda732 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -946,6 +946,55 @@ bool __cdecl MSVCP__uncaught_exception(void) } #if _MSVCP_VER >= 140 +void** CDECL __current_exception(void); + +/* compute the this pointer for a base class of a given type */ +static inline void *get_this_pointer( const this_ptr_offsets *off, void *object ) +{ + if (!object) return NULL; + + if (off->vbase_descr >= 0) + { + int *offset_ptr; + + /* move this ptr to vbase descriptor */ + object = (char *)object + off->vbase_descr; + /* and fetch additional offset from vbase descriptor */ + offset_ptr = (int *)(*(char **)object + off->vbase_offset); + object = (char *)object + *offset_ptr; + } + + object = (char *)object + off->this_offset; + return object; +} + +#ifdef __i386__ +extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); +__ASM_GLOBAL_FUNC( call_copy_ctor, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl $1\n\t" + "movl 12(%ebp), %ecx\n\t" + "pushl 16(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ); +#else +static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) +{ + TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); + if (has_vbase) + ((void (__cdecl*)(void*, void*, BOOL))func)(this, src, 1); + else + ((void (__cdecl*)(void*, void*))func)(this, src); +} +#endif + int __cdecl __uncaught_exceptions(void) { return *__processing_throw(); @@ -1067,6 +1116,106 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) ep->rec->NumberParameters, ep->rec->ExceptionInformation); } +/********************************************************************* + * ?__ExceptionPtrCurrentException@@YAXPAX(a)Z + * ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z + */ +#ifndef __x86_64__ +void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +{ + void **current_exception = __current_exception(); + EXCEPTION_RECORD *rec = current_exception ? *current_exception : NULL; + + TRACE("(%p)\n", ep); + + if (!rec) + { + ep->rec = NULL; + ep->ref = NULL; + return; + } + + ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); + ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); + + *ep->rec = *rec; + *ep->ref = 1; + + if (ep->rec->ExceptionCode == CXX_EXCEPTION) + { + const cxx_exception_type *et = (void*)ep->rec->ExceptionInformation[2]; + const cxx_type_info *ti; + void **data, *obj; + + ti = et->type_info_table->info[0]; + data = HeapAlloc(GetProcessHeap(), 0, ti->size); + + obj = (void*)ep->rec->ExceptionInformation[1]; + if (ti->flags & CLASS_IS_SIMPLE_TYPE) + { + memcpy(data, obj, ti->size); + if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); + } + else if (ti->copy_ctor) + { + call_copy_ctor(ti->copy_ctor, data, get_this_pointer(&ti->offsets, obj), + ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); + } + else + memcpy(data, get_this_pointer(&ti->offsets, obj), ti->size); + ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; + } + return; +} +#else +void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +{ + void **current_exception = __current_exception(); + EXCEPTION_RECORD *rec = current_exception ? *current_exception : NULL; + + TRACE("(%p)\n", ep); + + if (!rec) + { + ep->rec = NULL; + ep->ref = NULL; + return; + } + + ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); + ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); + + *ep->rec = *rec; + *ep->ref = 1; + + if (ep->rec->ExceptionCode == CXX_EXCEPTION) + { + const cxx_exception_type *et = (void*)ep->rec->ExceptionInformation[2]; + const cxx_type_info *ti; + void **data, *obj; + char *base = RtlPcToFileHeader((void*)et, (void**)&base); + + ti = (const cxx_type_info*)(base + ((const cxx_type_info_table*)(base + et->type_info_table))->info[0]); + data = HeapAlloc(GetProcessHeap(), 0, ti->size); + + obj = (void*)ep->rec->ExceptionInformation[1]; + if (ti->flags & CLASS_IS_SIMPLE_TYPE) + { + memcpy(data, obj, ti->size); + if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); + } + else if (ti->copy_ctor) + { + call_copy_ctor(base + ti->copy_ctor, data, get_this_pointer(&ti->offsets, obj), + ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); + } + else + memcpy(data, get_this_pointer(&ti->offsets, obj), ti->size); + ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; + } + return; +} +#endif #endif #if _MSVCP_VER >= 70 || defined(_MSVCIRT)

1 0

Paul Gofman : msvcp140: Import __ExceptionPtrToBool implementation.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 1986dcc69c2bf7af3675b1cde3782b4439249964 URL: https://gitlab.winehq.org/wine/wine/-/commit/1986dcc69c2bf7af3675b1cde3782b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 11 15:47:24 2022 -0500 msvcp140: Import __ExceptionPtrToBool implementation. --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/exception.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 6a63f546625..e5e965db3e8 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1707,8 +1707,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) __ExceptionPtrToBool @ cdecl -arch=arm ?always_noconv(a)codecvt_base@std@@QBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=i386 ?always_noconv(a)codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv(a)codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 9da49dda732..aa7cffb8c17 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1216,6 +1216,15 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) return; } #endif + +/********************************************************************* + * ?__ExceptionPtrToBool@@YA_NPBX(a)Z + * ?__ExceptionPtrToBool@@YA_NPEBX(a)Z + */ +bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) +{ + return !!ep->rec; +} #endif #if _MSVCP_VER >= 70 || defined(_MSVCIRT)

1 0

Paul Gofman : msvcp140: Import __ExceptionPtrCopyException implementation.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 961428dc74631ba6b142a7c9213a036822404870 URL: https://gitlab.winehq.org/wine/wine/-/commit/961428dc74631ba6b142a7c9213a03… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 11 15:50:26 2022 -0500 msvcp140: Import __ExceptionPtrCopyException implementation. --- dlls/msvcp140/msvcp140.spec | 4 +-- dlls/msvcp90/exception.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e5e965db3e8..321e36abb03 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1695,8 +1695,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy -@ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z -@ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException +@ cdecl -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException @ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX(a)Z(ptr) __ExceptionPtrCreate @ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX(a)Z(ptr) __ExceptionPtrCreate @ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX(a)Z(ptr) __ExceptionPtrCurrentException diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index aa7cffb8c17..6483e21c7b9 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +#define CXX_FRAME_MAGIC_VC6 0x19930520 + CREATE_TYPE_INFO_VTABLE #define CLASS_IS_SIMPLE_TYPE 1 @@ -1225,6 +1227,88 @@ bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) { return !!ep->rec; } + +/********************************************************************* + * ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z + * ?__ExceptionPtrCopyException@@YAXPEAXPEBX1(a)Z + */ +#ifndef __x86_64__ +void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, + exception *object, const cxx_exception_type *type) +{ + const cxx_type_info *ti; + void **data; + + __ExceptionPtrDestroy(ep); + + ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); + ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); + *ep->ref = 1; + + memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); + ep->rec->ExceptionCode = CXX_EXCEPTION; + ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->NumberParameters = 3; + ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; + ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; + + ti = type->type_info_table->info[0]; + data = HeapAlloc(GetProcessHeap(), 0, ti->size); + if (ti->flags & CLASS_IS_SIMPLE_TYPE) + { + memcpy(data, object, ti->size); + if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); + } + else if (ti->copy_ctor) + { + call_copy_ctor(ti->copy_ctor, data, get_this_pointer(&ti->offsets, object), + ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); + } + else + memcpy(data, get_this_pointer(&ti->offsets, object), ti->size); + ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; +} +#else +void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, + exception *object, const cxx_exception_type *type) +{ + const cxx_type_info *ti; + void **data; + char *base; + + RtlPcToFileHeader((void*)type, (void**)&base); + __ExceptionPtrDestroy(ep); + + ep->rec = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCEPTION_RECORD)); + ep->ref = HeapAlloc(GetProcessHeap(), 0, sizeof(int)); + *ep->ref = 1; + + memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); + ep->rec->ExceptionCode = CXX_EXCEPTION; + ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->NumberParameters = 4; + ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; + ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; + ep->rec->ExceptionInformation[3] = (ULONG_PTR)base; + + ti = (const cxx_type_info*)(base + ((const cxx_type_info_table*)(base + type->type_info_table))->info[0]); + data = HeapAlloc(GetProcessHeap(), 0, ti->size); + if (ti->flags & CLASS_IS_SIMPLE_TYPE) + { + memcpy(data, object, ti->size); + if (ti->size == sizeof(void *)) *data = get_this_pointer(&ti->offsets, *data); + } + else if (ti->copy_ctor) + { + call_copy_ctor(base + ti->copy_ctor, data, get_this_pointer(&ti->offsets, object), + ti->flags & CLASS_HAS_VIRTUAL_BASE_CLASS); + } + else + memcpy(data, get_this_pointer(&ti->offsets, object), ti->size); + ep->rec->ExceptionInformation[1] = (ULONG_PTR)data; +} +#endif + #endif #if _MSVCP_VER >= 70 || defined(_MSVCIRT)

1 0

Zebediah Figura : qcap: Fix frame interval calculation.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: a19ceddeb026250bbd9843cd675f61bff8881bf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a19ceddeb026250bbd9843cd675f61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 11 20:46:38 2022 -0500 qcap: Fix frame interval calculation. --- dlls/qcap/v4l.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 577cc829329..1b8a3658dcf 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -387,8 +387,8 @@ static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, caps->media_type.cbFormat = sizeof(VIDEOINFOHEADER); /* We reallocate the caps array, so pbFormat has to be set after all caps * have been enumerated. */ - caps->config.MaxFrameInterval = 10000000 * max_fps; - caps->config.MinFrameInterval = 10000000 * min_fps; + caps->config.MaxFrameInterval = 10000000 / max_fps; + caps->config.MinFrameInterval = 10000000 / min_fps; caps->config.MaxOutputSize.cx = width; caps->config.MaxOutputSize.cy = height; caps->config.MinOutputSize.cx = width;

1 0

Zebediah Figura : qcap: Fix reversed max_fps and min_fps.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 333a871549aa896038fbeb3d8d218af782da3d48 URL: https://gitlab.winehq.org/wine/wine/-/commit/333a871549aa896038fbeb3d8d218a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 11 20:48:50 2022 -0500 qcap: Fix reversed max_fps and min_fps. The maximum FPS is the inverse of the minimum frame time, not the maximum frame time, and vice versa. --- dlls/qcap/v4l.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 1b8a3658dcf..b2ccaa6c53e 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -528,8 +528,8 @@ static NTSTATUS v4l_device_create( void *args ) else if (frmival.type == V4L2_FRMIVAL_TYPE_STEPWISE || frmival.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) { - max_fps = frmival.stepwise.max.denominator / frmival.stepwise.max.numerator; - min_fps = frmival.stepwise.min.denominator / frmival.stepwise.min.numerator; + min_fps = frmival.stepwise.max.denominator / frmival.stepwise.max.numerator; + max_fps = frmival.stepwise.min.denominator / frmival.stepwise.min.numerator; } } else

1 0

Zebediah Figura : qcap/tests: Test that the video capture filter sets timestamps.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: cc09167060bcf7ebe1a2de075dc59e38cea20a5b URL: https://gitlab.winehq.org/wine/wine/-/commit/cc09167060bcf7ebe1a2de075dc59e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 11 21:39:48 2022 -0500 qcap/tests: Test that the video capture filter sets timestamps. OpenSeeFace depends on this. --- dlls/qcap/tests/videocapture.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 41b2cbc6a3f..cb74c20481f 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -353,6 +353,7 @@ struct testfilter { struct strmbase_filter filter; struct strmbase_sink sink; + HANDLE got_sample; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -371,6 +372,8 @@ static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, un static void testfilter_destroy(struct strmbase_filter *iface) { struct testfilter *filter = impl_from_strmbase_filter(iface); + + CloseHandle(filter->got_sample); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); } @@ -396,6 +399,17 @@ static HRESULT testsink_query_interface(struct strmbase_pin *iface, REFIID iid, static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + REFERENCE_TIME start, end; + HRESULT hr; + + if (winetest_debug > 1) trace("Receive()\n"); + + hr = IMediaSample_GetTime(sample, &start, &end); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + + SetEvent(filter->got_sample); + return S_OK; } @@ -411,13 +425,16 @@ static void testfilter_init(struct testfilter *filter) memset(filter, 0, sizeof(*filter)); strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); + filter->got_sample = CreateEventW(NULL, FALSE, FALSE, NULL); } -static void test_filter_state(IMediaControl *control, IMemAllocator *allocator) +static void test_filter_state(IMediaControl *control, struct testfilter *filter) { + IMemAllocator *allocator = filter->sink.pAllocator; IMediaSample *sample; OAFilterState state; HRESULT hr; + DWORD ret; hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -440,6 +457,13 @@ static void test_filter_state(IMediaControl *control, IMemAllocator *allocator) hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); + /* starting up the webcam can be a little slow */ + ret = WaitForSingleObject(filter->got_sample, 5000); + ok(!ret, "Got %lu.\n", ret); + + ret = WaitForSingleObject(filter->got_sample, 1000); + ok(!ret, "Got %lu.\n", ret); + hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(state == State_Running, "Got state %lu.\n", state); @@ -547,7 +571,7 @@ static void test_connect_pin(IBaseFilter *filter, IPin *source) ok(!!testsink.sink.pAllocator, "Expected to be assigned an allocator.\n"); - test_filter_state(control, testsink.sink.pAllocator); + test_filter_state(control, &testsink); hr = IPin_ConnectedTo(source, &peer); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Alexandre Julliard : wined3d: Use a Wine debug channel for vkd3d debug output.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 89bb66aff8b34c095773e13cdae2f36a22a87abb URL: https://gitlab.winehq.org/wine/wine/-/commit/89bb66aff8b34c095773e13cdae2f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 29 11:47:43 2022 +0200 wined3d: Use a Wine debug channel for vkd3d debug output. Avoids spamming stderr when debug output is disabled. --- dlls/wined3d/wined3d_main.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2e4dda2c473..576da8034c9 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -30,6 +30,7 @@ #include <vkd3d.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(vkd3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); struct wined3d_wndproc @@ -471,6 +472,23 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (appkey) RegCloseKey( appkey ); if (hkey) RegCloseKey( hkey ); + if (!getenv( "VKD3D_DEBUG" )) + { + if (TRACE_ON(vkd3d)) putenv( "VKD3D_DEBUG=trace" ); + else if (WARN_ON(vkd3d)) putenv( "VKD3D_DEBUG=warn" ); + else if (FIXME_ON(vkd3d)) putenv( "VKD3D_DEBUG=fixme" ); + else if (ERR_ON(vkd3d)) putenv( "VKD3D_DEBUG=err" ); + else putenv( "VKD3D_DEBUG=none" ); + } + if (!getenv( "VKD3D_SHADER_DEBUG" )) + { + if (TRACE_ON(vkd3d)) putenv( "VKD3D_SHADER_DEBUG=trace" ); + else if (WARN_ON(vkd3d)) putenv( "VKD3D_SHADER_DEBUG=warn" ); + else if (FIXME_ON(vkd3d)) putenv( "VKD3D_SHADER_DEBUG=fixme" ); + else if (ERR_ON(vkd3d)) putenv( "VKD3D_SHADER_DEBUG=err" ); + else putenv( "VKD3D_SHADER_DEBUG=none" ); + } + vkd3d_set_log_callback(vkd3d_log_callback); return TRUE;

1 0