- Wine-Commits - list.winehq.org

Georg Lehmann : winevulkan: Update to VK spec version 1.3.237.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 07761336d63be474069ec5114977ac9c13a35783 URL: https://gitlab.winehq.org/wine/wine/-/commit/07761336d63be474069ec5114977ac… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Dec 8 18:48:48 2022 +0100 winevulkan: Update to VK spec version 1.3.237. --- dlls/winevulkan/loader_thunks.c | 12 ++ dlls/winevulkan/loader_thunks.h | 8 + dlls/winevulkan/make_vulkan | 3 +- dlls/winevulkan/vulkan_thunks.c | 384 +++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 2 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 123 ++++++++++++- 7 files changed, 523 insertions(+), 11 deletions(-)

1 0

Piotr Caban : msvcp70: Update spec file.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 894b28085c6b01a96f65f0612504e9caa93bb47c URL: https://gitlab.winehq.org/wine/wine/-/commit/894b28085c6b01a96f65f0612504e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 8 18:02:04 2022 +0100 msvcp70: Update spec file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54101 --- dlls/msvcp70/msvcp70.spec | 156 ++++++++++++++++------------------------------ 1 file changed, 54 insertions(+), 102 deletions(-)

1 0

Torge Matthies : msvcr100: Implement missing_wait exception.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: cef3dcbddd1fc86d5ea82017548022fbe949d633 URL: https://gitlab.winehq.org/wine/wine/-/commit/cef3dcbddd1fc86d5ea82017548022… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr100: Implement missing_wait exception. --- dlls/concrt140/concrt140.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ dlls/msvcrt/concurrency.c | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 65 insertions(+), 28 deletions(-)

1 0

Torge Matthies : msvcr100: Move exception_ptr functions to a separate file.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 11631680346a9395540b245d9e0989c1d9ca52cc URL: https://gitlab.winehq.org/wine/wine/-/commit/11631680346a9395540b245d9e0989… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr100: Move exception_ptr functions to a separate file. --- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/cpp.c | 357 ++------------------------------------------ dlls/msvcrt/cxx.h | 8 + dlls/msvcrt/exception_ptr.c | 350 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 378 insertions(+), 341 deletions(-)

1 0

Torge Matthies : msvcr120: Throw exception in ~_StructuredTaskCollection if _RunAndWait was not called.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: a261c043ebc74d39462a31a0dfcacf055f4b6c4c URL: https://gitlab.winehq.org/wine/wine/-/commit/a261c043ebc74d39462a31a0dfcacf… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr120: Throw exception in ~_StructuredTaskCollection if _RunAndWait was not called. --- dlls/msvcrt/concurrency.c | 11 +++++++++++ dlls/msvcrt/cxx.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 6d7e9f18d63..fe156938e3a 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -686,6 +686,9 @@ DEFINE_CXX_DATA1(invalid_multiple_scheduling, &cexception_cxx_type_info, cexcept DEFINE_CXX_DATA1(invalid_scheduler_policy_key, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_thread_specification, &cexception_cxx_type_info, cexception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_value, &cexception_cxx_type_info, cexception_dtor) +#if _MSVCR_VER >= 120 +DEFINE_CXX_DATA1(missing_wait, &cexception_cxx_type_info, cexception_dtor) +#endif DEFINE_CXX_DATA1(scheduler_resource_allocation_error, &cexception_cxx_type_info, cexception_dtor) __ASM_BLOCK_BEGIN(concurrency_exception_vtables) @@ -1930,6 +1933,11 @@ DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_dtor, 4) void __thiscall _StructuredTaskCollection_dtor(_StructuredTaskCollection *this) { FIXME("(%p): stub!\n", this); + if (this->count && !__uncaught_exception()) { + missing_wait e; + missing_wait_ctor_str(&e, "Missing call to _RunAndWait"); + _CxxThrowException(&e, &missing_wait_exception_type); + } } #endif /* _MSVCR_VER >= 120 */ @@ -3445,6 +3453,9 @@ void msvcrt_init_concurrency(void *base) init_invalid_scheduler_policy_key_cxx(base); init_invalid_scheduler_policy_thread_specification_cxx(base); init_invalid_scheduler_policy_value_cxx(base); +#if _MSVCR_VER >= 120 + init_missing_wait_cxx(base); +#endif init_scheduler_resource_allocation_error_cxx(base); #endif } diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index c2558974b73..aa73aabf797 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -321,3 +321,5 @@ void exception_ptr_from_record(exception_ptr*,EXCEPTION_RECORD*) DECLSPEC_HIDDEN void __cdecl __ExceptionPtrCreate(exception_ptr*); void __cdecl __ExceptionPtrDestroy(exception_ptr*); void __cdecl __ExceptionPtrRethrow(const exception_ptr*); + +BOOL __cdecl __uncaught_exception(void);

1 0

Torge Matthies : msvcr100: Implement exception passing from chore threads to _RunAndWait.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: f26985affee6517def3d32e412b0e1117d325857 URL: https://gitlab.winehq.org/wine/wine/-/commit/f26985affee6517def3d32e412b0e1… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr100: Implement exception passing from chore threads to _RunAndWait. --- dlls/concrt140/Makefile.in | 4 ++- dlls/concrt140/concrt140.c | 10 ++++++- dlls/crtdll/Makefile.in | 1 + dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + dlls/msvcrt/concurrency.c | 69 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cxx.h | 5 ++++ dlls/msvcrt/except_i386.c | 15 ---------- dlls/msvcrt/exception_ptr.c | 56 ++++++++++++++++++++++++++---------- dlls/msvcrtd/Makefile.in | 1 + dlls/ucrtbase/Makefile.in | 1 + 13 files changed, 132 insertions(+), 34 deletions(-)

1 0

Jacek Caban : winevulkan: Rename needs_host_type to needs_win32_type.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: c65bfc062bfe1e2256a814ec7a0286214da04b0e URL: https://gitlab.winehq.org/wine/wine/-/commit/c65bfc062bfe1e2256a814ec7a0286… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 15:56:39 2022 +0100 winevulkan: Rename needs_host_type to needs_win32_type. --- dlls/winevulkan/make_vulkan | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 40ea2aa79d5..fb8aa1f8185 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1260,8 +1260,8 @@ class VkVariable(object): return (self.is_struct() or (self.is_union() and self.selector)) and self.struct.needs_alloc(conv, unwrap) - def needs_host_type(self): - return (self.is_struct() or (self.is_union() and self.selector)) and self.struct.needs_host_type() + def needs_win32_type(self): + return (self.is_struct() or (self.is_union() and self.selector)) and self.struct.needs_win32_type() def get_conversions(self, unwrap, parent_const=False): """ Get a list of conversions required for this parameter if any. @@ -1315,7 +1315,7 @@ class VkVariable(object): cast_type += "PTR32 *" else: cast_type += self.type - if self.needs_host_type(): + if self.needs_win32_type(): cast_type += "32" if self.is_pointer(): @@ -1496,7 +1496,7 @@ class VkMember(VkVariable): text += "struct " text += self.type - if conv and self.needs_host_type(): + if conv and self.needs_win32_type(): text += "32" if self.is_pointer(): @@ -1717,7 +1717,7 @@ class VkParam(VkVariable): proto += self.type name = self.name - if conv and self.needs_host_type(): + if conv and self.needs_win32_type(): proto += "32" if is_member and self.needs_alignment(): @@ -2139,7 +2139,7 @@ class VkStruct(Sequence): return False - def needs_host_type(self): + def needs_win32_type(self): # VkAllocationCallbacks never needs conversion if self.name == "VkAllocationCallbacks": return False @@ -2151,7 +2151,7 @@ class VkStruct(Sequence): return True if m.needs_alignment(): return True - if (m.is_struct() or m.is_union()) and m.struct.needs_host_type(): + if (m.is_struct() or m.is_union()) and m.struct.needs_win32_type(): return True def set_type_info(self, types): @@ -2233,7 +2233,7 @@ class StructConversionFunction(object): needs_alloc = self.direction != Direction.OUTPUT and self.operand.needs_alloc(self.conv, self.unwrap) win_type = self.type - if self.conv and self.operand.needs_host_type(): + if self.conv and self.operand.needs_win32_type(): win_type += "32" if self.direction == Direction.OUTPUT and self.const: win_type = "const " + win_type @@ -2323,7 +2323,7 @@ class StructConversionFunction(object): continue stype = next(x for x in ext.members if x.name == "sType").values - win_type = ext.name + "32" if self.conv and ext.needs_host_type() else ext.name + win_type = ext.name + "32" if self.conv and ext.needs_win32_type() else ext.name if self.direction == Direction.INPUT: in_type = "const " + win_type out_type = ext.name @@ -2421,7 +2421,7 @@ class ArrayConversionFunction(object): win_type = self.type if self.conv: - if self.array.needs_host_type(): + if self.array.needs_win32_type(): win_type += "32" elif self.array.is_handle() and self.array.handle.is_dispatchable(): win_type = "PTR32" @@ -2545,7 +2545,7 @@ class VkGenerator(object): # Build a list conversion functions for struct conversion. self.conversions = [] - self.host_structs = [] + self.win32_structs = [] for func in self.registry.funcs.values(): if not func.needs_exposing(): continue @@ -2560,18 +2560,18 @@ class VkGenerator(object): continue for e in conv.operand.struct_extensions: - if not e.required or not e.needs_host_type(): + if not e.required or not e.needs_win32_type(): continue - if not any(s.name == e.name for s in self.host_structs): - self.host_structs.append(e) + if not any(s.name == e.name for s in self.win32_structs): + self.win32_structs.append(e) - if not conv.operand.needs_host_type(): + if not conv.operand.needs_win32_type(): continue # Structs can be used in different ways by different conversions # e.g. array vs non-array. Just make sure we pull in each struct once. - if not any(s.name == conv.operand.name for s in self.host_structs): - self.host_structs.append(conv.operand) + if not any(s.name == conv.operand.name for s in self.win32_structs): + self.win32_structs.append(conv.operand) def _generate_copyright(self, f, spec_file=False): f.write("# " if spec_file else "/* ") @@ -2598,7 +2598,7 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") - for struct in self.host_structs: + for struct in self.win32_structs: f.write(struct.definition(conv=True, align=True)) f.write("\n")

1 0

Torge Matthies : msvcr100: Factor out EXCEPTION_RECORD to exception_ptr conversion.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 96e2a766f8b9e84bf01c98d4fbcb4ae849f8e8a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/96e2a766f8b9e84bf01c98d4fbcb4a… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr100: Factor out EXCEPTION_RECORD to exception_ptr conversion. --- dlls/msvcrt/exception_ptr.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/exception_ptr.c b/dlls/msvcrt/exception_ptr.c index d4c427e436f..8238baec548 100644 --- a/dlls/msvcrt/exception_ptr.c +++ b/dlls/msvcrt/exception_ptr.c @@ -151,15 +151,9 @@ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vb } #endif -/********************************************************************* - * ?__ExceptionPtrCurrentException@@YAXPAX(a)Z - * ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z - */ #ifndef __x86_64__ -void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +static void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) { - EXCEPTION_RECORD *rec = msvcrt_get_thread_data()->exc_record; - TRACE("(%p)\n", ep); if (!rec) @@ -202,10 +196,8 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) return; } #else -void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +static void exception_ptr_from_record(exception_ptr *ep, EXCEPTION_RECORD *rec) { - EXCEPTION_RECORD *rec = msvcrt_get_thread_data()->exc_record; - TRACE("(%p)\n", ep); if (!rec) @@ -250,6 +242,16 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +/********************************************************************* + * ?__ExceptionPtrCurrentException@@YAXPAX(a)Z + * ?__ExceptionPtrCurrentException@@YAXPEAX(a)Z + */ +void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) +{ + TRACE("(%p)\n", ep); + exception_ptr_from_record(ep, msvcrt_get_thread_data()->exc_record); +} + #if _MSVCR_VER >= 110 /********************************************************************* * ?__ExceptionPtrToBool@@YA_NPBX(a)Z

1 0

Torge Matthies : msvcr110: Implement _StructuredTaskCollection constructor.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: d1468c2b609df6b278fb9f9357441995ffd58939 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1468c2b609df6b278fb9f93574419… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:01 2022 +0200 msvcr110: Implement _StructuredTaskCollection constructor. --- dlls/msvcr120/tests/msvcr120.c | 6 +++--- dlls/msvcrt/concurrency.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 91e9bae1cf8..0a4fb383e0e 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -1403,7 +1403,7 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) MSVCRT_bool canceling = call_func1( p__StructuredTaskCollection__IsCanceling, chore->chore.task_collection); - ok(canceling, "Task is not canceling\n"); + todo_wine ok(canceling, "Task is not canceling\n"); } } @@ -1433,7 +1433,7 @@ static void test_StructuredTaskCollection(void) skip("_StructuredTaskCollection constructor not implemented\n"); return; } - ok(task_coll.unk2 == 0x1fffffff, + todo_wine ok(task_coll.unk2 == 0x1fffffff, "_StructuredTaskCollection ctor set wrong unk2: 0x%x != 0x1fffffff\n", task_coll.unk2); ok(task_coll.unk3 == NULL, "_StructuredTaskCollection ctor set wrong unk3: %p != NULL\n", task_coll.unk3); @@ -1587,7 +1587,7 @@ static void test_StructuredTaskCollection(void) ok(b, "SetEvent failed\n"); status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); - ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + todo_wine ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); call_func1(p__StructuredTaskCollection_dtor, &task_coll); CloseHandle(chore_start_evt); diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index fbb2c8b4147..5a6bbec5452 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1873,8 +1873,14 @@ DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection_ctor, 8) _StructuredTaskCollection* __thiscall _StructuredTaskCollection_ctor( _StructuredTaskCollection *this, /*_CancellationTokenState*/void *token) { - FIXME("(%p): stub\n", this); - return NULL; + TRACE("(%p)\n", this); + + if (token) + FIXME("_StructuredTaskCollection with cancellation token not implemented!\n"); + + memset(this, 0, sizeof(*this)); + this->finished = FINISHED_INITIAL; + return this; } #endif /* _MSVCR_VER >= 110 */

1 0

Jacek Caban : user32: Merge winpos.c into win.c.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 1d4a230c69cd78fa6efe3bd7879619dfc5afa4cf URL: https://gitlab.winehq.org/wine/wine/-/commit/1d4a230c69cd78fa6efe3bd7879619… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 01:22:08 2022 +0100 user32: Merge winpos.c into win.c. --- dlls/user32/Makefile.in | 1 - dlls/user32/win.c | 228 ++++++++++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 258 ------------------------------------------------ 3 files changed, 228 insertions(+), 259 deletions(-)

1 0