August 2021 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Move invalid_scheduler_policy_value to concurrency.c.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: a7bbdea08994625411c94da97ef6b5fbcfb5aaf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7bbdea08994625411c94da9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:53 2021 +0200 msvcrt: Move invalid_scheduler_policy_value to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 76 +++++++++++++++++++++++++++++++++++++++-------- dlls/msvcrt/cpp.c | 43 --------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 64 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7bbdea08994625411c9…

1 0

Piotr Caban : msvcrt: Move invalid_scheduler_policy_thread_specification to concurrency.c.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: c9189a411b7941377cb414eed15d1ce02d43959c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9189a411b7941377cb414ee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:56 2021 +0200 msvcrt: Move invalid_scheduler_policy_thread_specification to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 43 ------------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 43 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c9189a411b7941377cb4…

1 0

Piotr Caban : msvcrt: Move improper_scheduler_attach to concurrency.c.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 9694fc11fee300134486ee359b525afe098748c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9694fc11fee300134486ee35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:45:01 2021 +0200 msvcrt: Move improper_scheduler_attach to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 43 ------------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index e3d7539c64c..5d65e0c35bc 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -302,6 +302,9 @@ typedef struct { typedef exception improper_lock; extern const vtable_ptr improper_lock_vtable; +typedef exception improper_scheduler_attach; +extern const vtable_ptr improper_scheduler_attach_vtable; + typedef exception invalid_scheduler_policy_key; extern const vtable_ptr invalid_scheduler_policy_key_vtable; @@ -370,6 +373,33 @@ improper_lock * __thiscall improper_lock_copy_ctor(improper_lock *this, const im return __exception_copy_ctor(this, rhs, &improper_lock_vtable); } +/* ??0improper_scheduler_attach(a)Concurrency@@QAE(a)PBD@Z */ +/* ??0improper_scheduler_attach(a)Concurrency@@QEAA(a)PEBD@Z */ +DEFINE_THISCALL_WRAPPER(improper_scheduler_attach_ctor_str, 8) +improper_scheduler_attach* __thiscall improper_scheduler_attach_ctor_str( + improper_scheduler_attach *this, const char *str) +{ + TRACE("(%p %p)\n", this, str); + return __exception_ctor(this, str, &improper_scheduler_attach_vtable); +} + +/* ??0improper_scheduler_attach(a)Concurrency@@QAE(a)XZ */ +/* ??0improper_scheduler_attach(a)Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(improper_scheduler_attach_ctor, 4) +improper_scheduler_attach* __thiscall improper_scheduler_attach_ctor( + improper_scheduler_attach *this) +{ + return improper_scheduler_attach_ctor_str(this, NULL); +} + +DEFINE_THISCALL_WRAPPER(improper_scheduler_attach_copy_ctor,8) +improper_scheduler_attach * __thiscall improper_scheduler_attach_copy_ctor( + improper_scheduler_attach * _this, const improper_scheduler_attach * rhs) +{ + TRACE("(%p %p)\n", _this, rhs); + return __exception_copy_ctor(_this, rhs, &improper_scheduler_attach_vtable); +} + /* ??0invalid_scheduler_policy_key(a)Concurrency@@QAE(a)PBD@Z */ /* ??0invalid_scheduler_policy_key(a)Concurrency@@QEAA(a)PEBD@Z */ DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_key_ctor_str, 8) @@ -498,6 +528,8 @@ HRESULT __thiscall scheduler_resource_allocation_error_get_error_code( DEFINE_RTTI_DATA1(improper_lock, 0, &cexception_rtti_base_descriptor, ".?AVimproper_lock(a)Concurrency@@") +DEFINE_RTTI_DATA1(improper_scheduler_attach, 0, &cexception_rtti_base_descriptor, + ".?AVimproper_scheduler_attach(a)Concurrency@@") DEFINE_RTTI_DATA1(invalid_scheduler_policy_key, 0, &cexception_rtti_base_descriptor, ".?AVinvalid_scheduler_policy_key(a)Concurrency@@") DEFINE_RTTI_DATA1(invalid_scheduler_policy_thread_specification, 0, &cexception_rtti_base_descriptor, @@ -508,6 +540,7 @@ DEFINE_RTTI_DATA1(scheduler_resource_allocation_error, 0, &cexception_rtti_base_ ".?AVscheduler_resource_allocation_error(a)Concurrency@@") DEFINE_CXX_DATA1(improper_lock, &cexception_cxx_type_info, cexception_dtor) +DEFINE_CXX_DATA1(improper_scheduler_attach, &cexception_cxx_type_info, cexception_dtor) 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) @@ -517,6 +550,9 @@ __ASM_BLOCK_BEGIN(concurrency_exception_vtables) __ASM_VTABLE(improper_lock, VTABLE_ADD_FUNC(cexception_vector_dtor) VTABLE_ADD_FUNC(cexception_what)); + __ASM_VTABLE(improper_scheduler_attach, + VTABLE_ADD_FUNC(cexception_vector_dtor) + VTABLE_ADD_FUNC(cexception_what)); __ASM_VTABLE(invalid_scheduler_policy_key, VTABLE_ADD_FUNC(cexception_vector_dtor) VTABLE_ADD_FUNC(cexception_what)); @@ -1105,8 +1141,11 @@ void __thiscall ThreadScheduler_Attach(ThreadScheduler *this) return; } - if(context->scheduler.scheduler == &this->scheduler) - throw_exception(EXCEPTION_IMPROPER_SCHEDULER_ATTACH, 0, NULL); + if(context->scheduler.scheduler == &this->scheduler) { + improper_scheduler_attach e; + improper_scheduler_attach_ctor_str(&e, NULL); + _CxxThrowException(&e, &improper_scheduler_attach_exception_type); + } if(context->scheduler.scheduler) { struct scheduler_list *l = operator_new(sizeof(*l)); @@ -2720,6 +2759,7 @@ void msvcrt_init_concurrency(void *base) #ifdef __x86_64__ init_cexception_rtti(base); init_improper_lock_rtti(base); + init_improper_scheduler_attach_rtti(base); init_invalid_scheduler_policy_key_rtti(base); init_invalid_scheduler_policy_thread_specification_rtti(base); init_invalid_scheduler_policy_value_rtti(base); @@ -2733,6 +2773,7 @@ void msvcrt_init_concurrency(void *base) init_cexception_cxx_type_info(base); init_improper_lock_cxx(base); + init_improper_scheduler_attach_cxx(base); init_invalid_scheduler_policy_key_cxx(base); init_invalid_scheduler_policy_thread_specification_cxx(base); init_invalid_scheduler_policy_value_cxx(base); diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 4975ea8b8a5..6bcc4614321 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -551,36 +551,6 @@ void __thiscall bad_alloc_dtor(bad_alloc * _this) #if _MSVCR_VER >= 100 -typedef exception improper_scheduler_attach; -extern const vtable_ptr improper_scheduler_attach_vtable; - -/* ??0improper_scheduler_attach(a)Concurrency@@QAE(a)PBD@Z */ -/* ??0improper_scheduler_attach(a)Concurrency@@QEAA(a)PEBD@Z */ -DEFINE_THISCALL_WRAPPER(improper_scheduler_attach_ctor_str, 8) -improper_scheduler_attach* __thiscall improper_scheduler_attach_ctor_str( - improper_scheduler_attach *this, const char *str) -{ - TRACE("(%p %p)\n", this, str); - return __exception_ctor(this, str, &improper_scheduler_attach_vtable); -} - -/* ??0improper_scheduler_attach(a)Concurrency@@QAE(a)XZ */ -/* ??0improper_scheduler_attach(a)Concurrency@@QEAA(a)XZ */ -DEFINE_THISCALL_WRAPPER(improper_scheduler_attach_ctor, 4) -improper_scheduler_attach* __thiscall improper_scheduler_attach_ctor( - improper_scheduler_attach *this) -{ - return improper_scheduler_attach_ctor_str(this, NULL); -} - -DEFINE_THISCALL_WRAPPER(improper_scheduler_attach_copy_ctor,8) -improper_scheduler_attach * __thiscall improper_scheduler_attach_copy_ctor( - improper_scheduler_attach * _this, const improper_scheduler_attach * rhs) -{ - TRACE("(%p %p)\n", _this, rhs); - return __exception_copy_ctor(_this, rhs, &improper_scheduler_attach_vtable); -} - typedef exception improper_scheduler_detach; extern const vtable_ptr improper_scheduler_detach_vtable; @@ -633,9 +603,6 @@ __ASM_VTABLE(__non_rtti_object, VTABLE_ADD_FUNC(__non_rtti_object_vector_dtor) VTABLE_ADD_FUNC(exception_what)); #if _MSVCR_VER >= 100 -__ASM_VTABLE(improper_scheduler_attach, - VTABLE_ADD_FUNC(exception_vector_dtor) - VTABLE_ADD_FUNC(exception_what)); __ASM_VTABLE(improper_scheduler_detach, VTABLE_ADD_FUNC(exception_vector_dtor) VTABLE_ADD_FUNC(exception_what)); @@ -655,8 +622,6 @@ DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@@ DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ) #endif #if _MSVCR_VER >= 100 -DEFINE_RTTI_DATA1(improper_scheduler_attach, 0, &exception_rtti_base_descriptor, - ".?AVimproper_scheduler_attach(a)Concurrency@@" ) DEFINE_RTTI_DATA1(improper_scheduler_detach, 0, &exception_rtti_base_descriptor, ".?AVimproper_scheduler_detach(a)Concurrency@@" ) #endif @@ -670,7 +635,6 @@ DEFINE_CXX_DATA2( __non_rtti_object, &bad_typeid_cxx_type_info, DEFINE_CXX_DATA1( bad_alloc, &exception_cxx_type_info, bad_alloc_dtor ) #endif #if _MSVCR_VER >= 100 -DEFINE_CXX_DATA1(improper_scheduler_attach, &exception_cxx_type_info, exception_dtor) DEFINE_CXX_DATA1(improper_scheduler_detach, &exception_cxx_type_info, exception_dtor) #endif @@ -687,7 +651,6 @@ void msvcrt_init_exception(void *base) init_bad_cast_rtti(base); init___non_rtti_object_rtti(base); #if _MSVCR_VER >= 100 - init_improper_scheduler_attach_rtti(base); init_improper_scheduler_detach_rtti(base); #endif @@ -699,7 +662,6 @@ void msvcrt_init_exception(void *base) init_bad_alloc_cxx(base); #endif #if _MSVCR_VER >= 100 - init_improper_scheduler_attach_cxx(base); init_improper_scheduler_detach_cxx(base); #endif #endif @@ -715,11 +677,6 @@ void throw_exception(exception_type et, HRESULT hr, const char *str) _CxxThrowException(&e, &bad_alloc_exception_type); } #if _MSVCR_VER >= 100 - case EXCEPTION_IMPROPER_SCHEDULER_ATTACH: { - improper_scheduler_attach e; - improper_scheduler_attach_ctor_str(&e, str); - _CxxThrowException(&e, &improper_scheduler_attach_exception_type); - } case EXCEPTION_IMPROPER_SCHEDULER_DETACH: { improper_scheduler_detach e; improper_scheduler_detach_ctor_str(&e, str); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3d5c330eff6..c1537220422 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -190,7 +190,6 @@ void msvcrt_set_errno(int) DECLSPEC_HIDDEN; typedef enum { EXCEPTION_BAD_ALLOC, #if _MSVCR_VER >= 100 - EXCEPTION_IMPROPER_SCHEDULER_ATTACH, EXCEPTION_IMPROPER_SCHEDULER_DETACH, #endif } exception_type;

1 0

Georg Lehmann : winevulkan: Return NULL for unavailable instance functions.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 11cfbe5c891f90af67a01e86e3457088bafbe33e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11cfbe5c891f90af67a01e86… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Aug 20 13:24:49 2021 +0200 winevulkan: Return NULL for unavailable instance functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49542 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 6 ++++++ dlls/winevulkan/loader_thunks.h | 3 +++ dlls/winevulkan/make_vulkan | 4 ++++ dlls/winevulkan/vulkan.c | 5 +++++ dlls/winevulkan/vulkan_private.h | 2 ++ dlls/winevulkan/vulkan_thunks.c | 1 + include/wine/vulkan.h | 2 +- 7 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 6bc32620bba..4857a0adc7a 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -116,6 +116,9 @@ PFN_vkVoidFunction WINAPI vkGetInstanceProcAddr(VkInstance instance, const char return NULL; } + if (!unix_funcs->p_is_available_instance_function(instance, name)) + return NULL; + func = wine_vk_get_instance_proc_addr(name); if (func) return func; @@ -175,6 +178,9 @@ void * WINAPI vk_icdGetPhysicalDeviceProcAddr(VkInstance instance, const char *n { TRACE("%p, %s\n", instance, debugstr_a(name)); + if (!unix_funcs->p_is_available_instance_function(instance, name)) + return NULL; + return wine_vk_get_phys_dev_proc_addr(name); } diff --git a/dlls/winevulkan/loader_thunks.h b/dlls/winevulkan/loader_thunks.h index f6695e93cad..fa0c3155658 100644 --- a/dlls/winevulkan/loader_thunks.h +++ b/dlls/winevulkan/loader_thunks.h @@ -419,6 +419,9 @@ struct unix_funcs VkResult (WINAPI *p_vkWaitSemaphores)(VkDevice, const VkSemaphoreWaitInfo *, uint64_t); VkResult (WINAPI *p_vkWaitSemaphoresKHR)(VkDevice, const VkSemaphoreWaitInfo *, uint64_t); VkResult (WINAPI *p_vkWriteAccelerationStructuresPropertiesKHR)(VkDevice, uint32_t, const VkAccelerationStructureKHR *, VkQueryType, size_t, void *, size_t); + + /* winevulkan specific functions */ + BOOL (WINAPI *p_is_available_instance_function)(VkInstance, const char *); }; #endif /* __WINE_VULKAN_LOADER_THUNKS_H */ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 55b5b71691e..760c460b6fe 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2788,6 +2788,7 @@ class VkGenerator(object): continue f.write(" &{1}{0},\n".format(vk_func.name, prefix)) + f.write(" &wine_vk_is_available_instance_function,\n") f.write("};\n") def generate_thunks_h(self, f, prefix): @@ -2988,6 +2989,9 @@ class VkGenerator(object): continue f.write(" {0};\n".format(vk_func.pfn(conv=False, call_conv="WINAPI"))) + f.write("\n") + f.write(" /* winevulkan specific functions */\n") + f.write(" BOOL (WINAPI *p_is_available_instance_function)(VkInstance, const char *);\n") f.write("};\n\n") f.write("#endif /* __WINE_VULKAN_LOADER_THUNKS_H */\n") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index fb0ffbdfe6c..3658a4378cb 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1605,3 +1605,8 @@ void WINAPI wine_vkDestroyDebugReportCallbackEXT( free(object); } + +BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) +{ + return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); +} diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 83dc90ca15e..ce83b2b7032 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -212,4 +212,6 @@ uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDD extern const struct unix_funcs loader_funcs; +BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const char *name) DECLSPEC_HIDDEN; + #endif /* __WINE_VULKAN_PRIVATE_H */ diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fd3ed950930..b19e3f73dae 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -8719,4 +8719,5 @@ const struct unix_funcs loader_funcs = &wine_vkWaitSemaphores, &wine_vkWaitSemaphoresKHR, &wine_vkWriteAccelerationStructuresPropertiesKHR, + &wine_vk_is_available_instance_function, }; diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 983d3143f89..1a20129a7fa 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -475,7 +475,7 @@ #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0) -#define VK_HEADER_VERSION 187 +#define VK_HEADER_VERSION 188 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_USE_64_BIT_PTR_DEFINES 0

1 0

Piotr Caban : msvcrt: Move scheduler_resource_allocation_error to concurrency.c.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: a8decf5c1511019e3cb22a0e4db06cb0e6b121b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8decf5c1511019e3cb22a0e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:46 2021 +0200 msvcrt: Move scheduler_resource_allocation_error to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 66 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/cpp.c | 64 --------------------------------------------- dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 63 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8decf5c1511019e3cb2…

1 0

Piotr Caban : msvcrt: Introduce macro for creating exception class.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: f6f8b30c47bc28be5df692743fcf81c7952153ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f8b30c47bc28be5df69274… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:38 2021 +0200 msvcrt: Introduce macro for creating exception class. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 192 +++++++----------------------------------------- dlls/msvcrt/cppexcept.h | 101 +++++++++++++++++++++++-- 2 files changed, 121 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6f8b30c47bc28be5df6…

1 0

Nikolay Sivov : oleaut32/tests: Add interface checks for font object.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: f7d26b4244fc69e878a548790daa6a47086656a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7d26b4244fc69e878a54879… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 12:00:15 2021 +0300 oleaut32/tests: Add interface checks for font object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olefont.c | 53 ++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 5137d807e78..c14d3d9435d 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -51,6 +51,21 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pOleCreateFontIndirect)(LPFONTDESC,REFIID,LPVOID*); +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -183,41 +198,27 @@ static void test_ifont_sizes(void) test_ifont_size(300000, 2, 2, -1058, "2:2 ratio 3"); } -static void test_QueryInterface(void) +static void test_interfaces(void) { - LPVOID pvObj = NULL; HRESULT hr; - IFont* font = NULL; - IPersistStreamInit *persistStreamInit = NULL; - LONG ref; + IFont *font = NULL; hr = pOleCreateFontIndirect(NULL, &IID_IFont, NULL); EXPECT_HR(hr, E_POINTER); - hr = pOleCreateFontIndirect(NULL, &IID_IFont, &pvObj); - font = pvObj; - + hr = pOleCreateFontIndirect(NULL, &IID_IFont, (void **)&font); EXPECT_HR(hr, S_OK); ok(font != NULL,"OCFI (NULL,..) returns NULL, instead of !NULL\n"); - pvObj = NULL; - hr = IFont_QueryInterface( font, &IID_IFont, &pvObj); - EXPECT_HR(hr, S_OK); - - /* Test if QueryInterface increments ref counter for IFONTs */ - ref = IFont_AddRef(font); - ok(ref == 3 || - broken(ref == 1), /* win95 */ - "IFont_QI expected ref value 3 but instead got %d\n", ref); - IFont_Release(font); + check_interface(font, &IID_IFont, TRUE); + check_interface(font, &IID_IFontDisp, TRUE); + check_interface(font, &IID_IDispatch, TRUE); + check_interface(font, &IID_IPersist, TRUE); + check_interface(font, &IID_IPersistStream, TRUE); + check_interface(font, &IID_IConnectionPointContainer, TRUE); + check_interface(font, &IID_IPersistPropertyBag, TRUE); + check_interface(font, &IID_IPersistStreamInit, FALSE); - ok(pvObj != NULL,"IFont_QI does return NULL, instead of a ptr\n"); - - /* IFont never had IPersistStreamInit */ - hr = IFont_QueryInterface(font, &IID_IPersistStreamInit, (void**)&persistStreamInit); - EXPECT_HR(hr, E_NOINTERFACE); - - IFont_Release(font); IFont_Release(font); } @@ -1278,7 +1279,7 @@ START_TEST(olefont) return; } - test_QueryInterface(); + test_interfaces(); test_type_info(); test_ifont_sizes(); test_font_events_disp();

1 0

Alexandre Julliard : ntdll: Always send a Wow context to the server for Wow64 processes.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: ee99bd4bc1b7ef4c18d5254a76d72d3bd38f41e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee99bd4bc1b7ef4c18d5254a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 11:34:49 2021 +0200 ntdll: Always send a Wow context to the server for Wow64 processes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index e47dfc645a2..e88a935ca31 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1025,6 +1025,9 @@ static void contexts_to_server( context_t server_contexts[2], CONTEXT *context ) context_to_server( &server_contexts[count++], native_machine, native_context, native_machine ); if (wow_context) context_to_server( &server_contexts[count++], main_image_info.Machine, wow_context, main_image_info.Machine ); + else if (native_machine != main_image_info.Machine) + context_to_server( &server_contexts[count++], main_image_info.Machine, + native_context, native_machine ); } else context_to_server( &server_contexts[count++], native_machine,

1 0

Alexandre Julliard : wow64: Add a thunk for the NtRaiseException syscall.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: e30b56b1a3af4fb001a7db4643bc358801856cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e30b56b1a3af4fb001a7db46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 15:02:25 2021 +0200 wow64: Add a thunk for the NtRaiseException syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 191 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/syscall.c | 5 +- dlls/wow64/syscall.h | 1 + dlls/wow64/wow64_private.h | 1 + 4 files changed, 195 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e30b56b1a3af4fb001a7…

1 0

Alexandre Julliard : wow64: Forward 64-bit invalid handle exceptions to the 32-bit guest.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 23081203348ee9b93e6deb1bd986697807450219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23081203348ee9b93e6deb1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 15:07:06 2021 +0200 wow64: Forward 64-bit invalid handle exceptions to the 32-bit guest. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/process.c | 21 +++++++++++++++++++++ dlls/wow64/syscall.c | 17 ++++++++++++++++- dlls/wow64/wow64.spec | 2 +- dlls/wow64/wow64_private.h | 5 +++-- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 5e0fedd136f..d66b973385b 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1251,3 +1251,24 @@ NTSTATUS WINAPI wow64_NtTerminateThread( UINT *args ) return NtTerminateThread( handle, exit_code ); } + + +/********************************************************************** + * Wow64PassExceptionToGuest (wow64.@) + */ +void WINAPI Wow64PassExceptionToGuest( EXCEPTION_POINTERS *ptrs ) +{ + EXCEPTION_RECORD *rec = ptrs->ExceptionRecord; + EXCEPTION_RECORD32 rec32; + ULONG i; + + rec32.ExceptionCode = rec->ExceptionCode; + rec32.ExceptionFlags = rec->ExceptionFlags; + rec32.ExceptionRecord = PtrToUlong( rec->ExceptionRecord ); + rec32.ExceptionAddress = PtrToUlong( rec->ExceptionAddress ); + rec32.NumberParameters = rec->NumberParameters; + for (i = 0; i < rec->NumberParameters; i++) + rec32.ExceptionInformation[i] = rec->ExceptionInformation[i]; + + call_user_exception_dispatcher( &rec32, NULL, ptrs->ContextRecord ); +} diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 62399225042..91f2a029e4b 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -519,6 +519,21 @@ static void free_temp_data(void) } +/********************************************************************** + * syscall_filter + */ +static LONG CALLBACK syscall_filter( EXCEPTION_POINTERS *ptrs ) +{ + switch (ptrs->ExceptionRecord->ExceptionCode) + { + case STATUS_INVALID_HANDLE: + Wow64PassExceptionToGuest( ptrs ); + break; + } + return EXCEPTION_EXECUTE_HANDLER; +} + + /********************************************************************** * Wow64SystemServiceEx (NTDLL.@) */ @@ -536,7 +551,7 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) syscall_thunk thunk = syscall_thunks[syscall_map[num]]; status = thunk( args ); } - __EXCEPT_ALL + __EXCEPT( syscall_filter ) { status = GetExceptionCode(); } diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 4ed20af0f29..69275b2580f 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -13,7 +13,7 @@ @ stdcall Wow64LdrpInitialize(ptr) @ stub Wow64LogPrint @ stub Wow64NotifyUnsimulateComplete -@ stub Wow64PassExceptionToGuest +@ stdcall Wow64PassExceptionToGuest(ptr) @ stub Wow64PrepareForDebuggerAttach @ stub Wow64PrepareForException @ stub Wow64RaiseException diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 3b44c513fa3..370ae76a0c4 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -28,8 +28,9 @@ ALL_SYSCALLS #undef SYSCALL_ENTRY -void * WINAPI Wow64AllocateTemp( SIZE_T size ) DECLSPEC_HIDDEN; -void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) DECLSPEC_HIDDEN; +void * WINAPI Wow64AllocateTemp( SIZE_T size ); +void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ); +void WINAPI Wow64PassExceptionToGuest( EXCEPTION_POINTERS *ptrs ); extern void init_file_redirects(void) DECLSPEC_HIDDEN; extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN;

1 0