wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Nikolay Sivov : d3d10/effect: Handle SetResource() called on null variable instance.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 455239e3791e1cce37ec8d2c7b3e950474c79d69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=455239e3791e1cce37ec8d2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 18 10:51:52 2021 +0300 d3d10/effect: Handle SetResource() called on null variable instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 3 +++ dlls/d3d10/tests/effect.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0ee63ed41d5..520f816098f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6237,6 +6237,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_SetResour TRACE("iface %p, resource %p.\n", iface, resource); + if (!d3d10_effect_shader_resource_variable_IsValid(iface)) + return E_FAIL; + set_shader_resource_variable(&resource, v->u.resource.srv); return S_OK; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 53e2d52c496..9a217993e7e 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5698,9 +5698,16 @@ static void test_effect_resource_variable(void) effect_desc.SharedGlobalVariables); ok(effect_desc.Techniques == 1, "Unexpected techniques count %u.\n", effect_desc.Techniques); + create_effect_texture_resource(device, &srv0, &tex0); + + /* SetResource() on null resource variable. */ + var = effect->lpVtbl->GetVariableByName(effect, "dummy name"); + t0 = var->lpVtbl->AsShaderResource(var); + hr = t0->lpVtbl->SetResource(t0, srv0); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + var = effect->lpVtbl->GetVariableByName(effect, "t0"); t0 = get_effect_shader_resource_variable(var); - create_effect_texture_resource(device, &srv0, &tex0); hr = t0->lpVtbl->SetResource(t0, srv0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : d3d10/effect: Handle geometry shader variables declared with stream output.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 6385d93e540adcd8af14df11f42d694c65440510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6385d93e540adcd8af14df11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 21:24:52 2021 +0200 d3d10/effect: Handle geometry shader variables declared with stream output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 7 + dlls/d3d10/effect.c | 38 ++++- dlls/d3d10/tests/effect.c | 398 ++++++++++++++++++++++++--------------------- 3 files changed, 254 insertions(+), 189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6385d93e540adcd8af14…

1 0

Georg Lehmann : winevulkan: Return NULL for unavailable device functions.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: fc8dcb53c2cebf9a08d9c49a4f7fc021b79fc819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc8dcb53c2cebf9a08d9c49a… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Aug 20 13:24:50 2021 +0200 winevulkan: Return NULL for unavailable device functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51360 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 | 9 ++++++--- dlls/winevulkan/loader_thunks.h | 1 + dlls/winevulkan/make_vulkan | 2 ++ dlls/winevulkan/vulkan.c | 5 +++++ dlls/winevulkan/vulkan_private.h | 1 + dlls/winevulkan/vulkan_thunks.c | 1 + 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 4857a0adc7a..86684cdf00c 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -147,9 +147,12 @@ PFN_vkVoidFunction WINAPI vkGetDeviceProcAddr(VkDevice device, const char *name) * vkCommandBuffer or vkQueue. * Loader takes care of filtering of extensions which are enabled or not. */ - func = wine_vk_get_device_proc_addr(name); - if (func) - return func; + if (unix_funcs->p_is_available_device_function(device, name)) + { + func = wine_vk_get_device_proc_addr(name); + if (func) + return func; + } /* vkGetDeviceProcAddr was intended for loading device and subdevice functions. * idTech 6 titles such as Doom and Wolfenstein II, however use it also for diff --git a/dlls/winevulkan/loader_thunks.h b/dlls/winevulkan/loader_thunks.h index fa0c3155658..516cb0f17c2 100644 --- a/dlls/winevulkan/loader_thunks.h +++ b/dlls/winevulkan/loader_thunks.h @@ -422,6 +422,7 @@ struct unix_funcs /* winevulkan specific functions */ BOOL (WINAPI *p_is_available_instance_function)(VkInstance, const char *); + BOOL (WINAPI *p_is_available_device_function)(VkDevice, const char *); }; #endif /* __WINE_VULKAN_LOADER_THUNKS_H */ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 760c460b6fe..ef4693651d2 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2789,6 +2789,7 @@ class VkGenerator(object): f.write(" &{1}{0},\n".format(vk_func.name, prefix)) f.write(" &wine_vk_is_available_instance_function,\n") + f.write(" &wine_vk_is_available_device_function,\n") f.write("};\n") def generate_thunks_h(self, f, prefix): @@ -2992,6 +2993,7 @@ class VkGenerator(object): f.write("\n") f.write(" /* winevulkan specific functions */\n") f.write(" BOOL (WINAPI *p_is_available_instance_function)(VkInstance, const char *);\n") + f.write(" BOOL (WINAPI *p_is_available_device_function)(VkDevice, 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 3658a4378cb..6f90db9736e 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1610,3 +1610,8 @@ BOOL WINAPI wine_vk_is_available_instance_function(VkInstance instance, const ch { return !!vk_funcs->p_vkGetInstanceProcAddr(instance->instance, name); } + +BOOL WINAPI wine_vk_is_available_device_function(VkDevice device, const char *name) +{ + return !!vk_funcs->p_vkGetDeviceProcAddr(device->device, name); +} diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index ce83b2b7032..6aa60f8c9ae 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -213,5 +213,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; +BOOL WINAPI wine_vk_is_available_device_function(VkDevice device, 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 b19e3f73dae..a65e544f1f9 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -8720,4 +8720,5 @@ const struct unix_funcs loader_funcs = &wine_vkWaitSemaphoresKHR, &wine_vkWriteAccelerationStructuresPropertiesKHR, &wine_vk_is_available_instance_function, + &wine_vk_is_available_device_function, };

1 0

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

20 Aug '21

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

Georg Lehmann : winemac.drv: Only return vulkan functions if the host function is available.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 6dee57f30ec65975ce6ecd689d5b6c3a2cc8d0ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dee57f30ec65975ce6ecd68… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Aug 20 13:24:48 2021 +0200 winemac.drv: Only return vulkan functions if the host function is available. 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/winemac.drv/vulkan.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 21ebcc56519..f546e3ccfa5 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -420,12 +420,32 @@ static VkResult macdrv_vkEnumerateInstanceExtensionProperties(const char *layer_ return res; } +static const char *wine_vk_native_fn_name(const char *name) +{ + const char *create_surface_name = + pvkCreateMetalSurfaceEXT ? "vkCreateMetalSurfaceEXT" : "vkCreateMacOSSurfaceMVK"; + + if (!strcmp(name, "vkCreateWin32SurfaceKHR")) + return create_surface_name; + /* We just need something where non-NULL is returned if the correct extension is enabled. + * So since there is no native equivalent of this function check for the create + * surface function. + */ + if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) + return create_surface_name; + + return name; +} + static void *macdrv_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); + if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = macdrv_get_vk_device_proc_addr(name))) return proc_addr; @@ -438,6 +458,9 @@ static void *macdrv_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); + if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = macdrv_get_vk_instance_proc_addr(instance, name))) return proc_addr;

1 0

Georg Lehmann : winex11.drv: Only return vulkan functions if the host function is available.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 71f7915650c5d779747ca0286086e69aff99b2dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=71f7915650c5d779747ca028… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Aug 20 13:24:47 2021 +0200 winex11.drv: Only return vulkan functions if the host function is available. 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/winex11.drv/vulkan.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index bdc287afeea..1bbdba2ce1d 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -435,12 +435,25 @@ static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, return pvkGetDeviceGroupSurfacePresentModesKHR(device, x11_surface->surface, flags); } +static const char *wine_vk_native_fn_name(const char *name) +{ + if (!strcmp(name, "vkCreateWin32SurfaceKHR")) + return "vkCreateXlibSurfaceKHR"; + if (!strcmp(name, "vkGetPhysicalDeviceWin32PresentationSupportKHR")) + return "vkGetPhysicalDeviceXlibPresentationSupportKHR"; + + return name; +} + static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) { void *proc_addr; TRACE("%p, %s\n", device, debugstr_a(name)); + if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) return proc_addr; @@ -453,6 +466,9 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); + if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) + return NULL; + if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) return proc_addr;

1 0

Piotr Caban : concrt140: Don't forward to msvcr120.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: c8ce9303065383838688947f0520c008d884dd0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8ce9303065383838688947f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:45:11 2021 +0200 concrt140: Don't forward to msvcr120. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/Makefile.in | 6 + dlls/concrt140/concrt140.c | 102 +++++++ dlls/concrt140/concrt140.spec | 676 +++++++++++++++++++++--------------------- 3 files changed, 446 insertions(+), 338 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8ce9303065383838688…

1 0

Piotr Caban : msvcrt: Simplify throw_exception helper.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 5e3f959aed66b719d845e9e81b282210758444b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e3f959aed66b719d845e9e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:45:08 2021 +0200 msvcrt: Simplify throw_exception helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 12 ++++-------- dlls/msvcrt/heap.c | 2 +- dlls/msvcrt/msvcrt.h | 5 +---- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 12a38bb2407..72abcfe055f 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -616,15 +616,11 @@ void msvcrt_init_exception(void *base) } #if _MSVCR_VER >= 80 -void throw_exception(exception_type et, HRESULT hr, const char *str) +void throw_bad_alloc(void) { - switch(et) { - case EXCEPTION_BAD_ALLOC: { - bad_alloc e; - __exception_ctor(&e, str, &bad_alloc_vtable); - _CxxThrowException(&e, &bad_alloc_exception_type); - } - } + bad_alloc e; + __exception_ctor(&e, "bad allocation", &bad_alloc_vtable); + _CxxThrowException(&e, &bad_alloc_exception_type); } #endif diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index b74a759227a..429a9e2ecda 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -156,7 +156,7 @@ void* CDECL DECLSPEC_HOTPATCH operator_new(size_t size) TRACE("(%Iu) out of memory\n", size); #if _MSVCR_VER >= 80 - throw_exception(EXCEPTION_BAD_ALLOC, 0, "bad allocation"); + throw_bad_alloc(); #endif return NULL; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4e8f917112b..60f8c2f5ef2 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -187,10 +187,7 @@ extern WORD *MSVCRT__pwctype; void msvcrt_set_errno(int) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 80 -typedef enum { - EXCEPTION_BAD_ALLOC, -} exception_type; -void throw_exception(exception_type, HRESULT, const char*) DECLSPEC_HIDDEN; +void throw_bad_alloc(void) DECLSPEC_HIDDEN; #endif void __cdecl _purecall(void);

1 0

Piotr Caban : msvcrt: Move improper_scheduler_detach to concurrency.c.
by Alexandre Julliard 20 Aug '21

20 Aug '21

Module: wine Branch: master Commit: 1c9a30f217ef0afcfeb86acf3911e51e81f49880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9a30f217ef0afcfeb86acf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:45:04 2021 +0200 msvcrt: Move improper_scheduler_detach 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 | 52 +++++++++++++++++++++++++++++++++++++---- dlls/msvcrt/cpp.c | 59 ----------------------------------------------- dlls/msvcrt/msvcrt.h | 3 --- 3 files changed, 48 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c9a30f217ef0afcfeb8…

1 0

Piotr Caban : msvcrt: Move improper_scheduler_attach to concurrency.c.
by Alexandre Julliard 20 Aug '21

20 Aug '21

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@Concurrency@@QAE@PBD@Z */ +/* ??0improper_scheduler_attach@Concurrency@@QEAA@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@Concurrency@@QAE@XZ */ +/* ??0improper_scheduler_attach@Concurrency@@QEAA@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@Concurrency@@QAE@PBD@Z */ /* ??0invalid_scheduler_policy_key@Concurrency@@QEAA@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@Concurrency@@") +DEFINE_RTTI_DATA1(improper_scheduler_attach, 0, &cexception_rtti_base_descriptor, + ".?AVimproper_scheduler_attach@Concurrency@@") DEFINE_RTTI_DATA1(invalid_scheduler_policy_key, 0, &cexception_rtti_base_descriptor, ".?AVinvalid_scheduler_policy_key@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@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@Concurrency@@QAE@PBD@Z */ -/* ??0improper_scheduler_attach@Concurrency@@QEAA@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@Concurrency@@QAE@XZ */ -/* ??0improper_scheduler_attach@Concurrency@@QEAA@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@Concurrency@@" ) DEFINE_RTTI_DATA1(improper_scheduler_detach, 0, &exception_rtti_base_descriptor, ".?AVimproper_scheduler_detach@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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021