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

Nikolay Sivov : d3dx10_43/tests: Test all attributes of glyph textures.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 7d60044e187704176981500d139e1591a4d63ad5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d60044e187704176981500d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 12:00:54 2021 +0300 d3dx10_43/tests: Test all attributes of glyph textures. 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/d3dx10_43/tests/d3dx10.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index cb2cb3e64f1..b7834fb6f8a 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2352,15 +2352,22 @@ todo_wine ID3D10Resource_Release(resource); ID3D10Texture2D_GetDesc(texture, &texture_desc); + ok(texture_desc.Width == 256, "Unexpected width %u.\n", texture_desc.Width); + ok(texture_desc.Height == 256, "Unexpected height %u.\n", texture_desc.Height); + ok(texture_desc.MipLevels == 5, "Unexpected miplevels %u.\n", texture_desc.MipLevels); + ok(texture_desc.ArraySize == 1, "Unexpected array size %u.\n", texture_desc.ArraySize); ok(texture_desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Unexpected format %#x.\n", texture_desc.Format); + ok(texture_desc.SampleDesc.Count == 1, "Unexpected samples count %u.\n", + texture_desc.SampleDesc.Count); + ok(texture_desc.SampleDesc.Quality == 0, "Unexpected quality level %u.\n", + texture_desc.SampleDesc.Quality); ok(texture_desc.Usage == 0, "Unexpected usage %#x.\n", texture_desc.Usage); - ok(texture_desc.Width == 256, "Unexpected width %u.\n", texture_desc.Width); - ok(texture_desc.Height == 256, "Unexpected height %u.\n", texture_desc.Height); - ok(texture_desc.CPUAccessFlags == 0, "Unexpected access flags %#x.\n", - texture_desc.CPUAccessFlags); ok(texture_desc.BindFlags == D3D10_BIND_SHADER_RESOURCE, "Unexpected bind flags %#x.\n", texture_desc.BindFlags); + ok(texture_desc.CPUAccessFlags == 0, "Unexpected access flags %#x.\n", + texture_desc.CPUAccessFlags); + ok(texture_desc.MiscFlags == 0, "Unexpected misc flags %#x.\n", texture_desc.MiscFlags); count = GetGlyphOutlineW(hdc, glyph, GGO_GLYPH_INDEX | GGO_METRICS, &glyph_metrics, 0, NULL, &mat); ok(count != GDI_ERROR, "Unexpected count %#x.\n", count);

1 0

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

Aug. 20, 2021

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

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

Aug. 20, 2021

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

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

Aug. 20, 2021

Module: wine Branch: master Commit: 635f59f2765c03a91b589b810a898bb0b0e566e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=635f59f2765c03a91b589b81… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:50 2021 +0200 msvcrt: Move invalid_scheduler_policy_key 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 | 43 ------------------------------ dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 58 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=635f59f2765c03a91b58…

1 0

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

Aug. 20, 2021

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 Aug. 20, 2021

Aug. 20, 2021

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 Aug. 20, 2021

Aug. 20, 2021

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

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

Aug. 20, 2021

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 : d3dx10_42/tests: Enable tests.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: df7bccf8ecdb01c7f9d299ddfe641903bcb52899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df7bccf8ecdb01c7f9d299dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 18 10:53:08 2021 +0300 d3dx10_42/tests: Enable tests. 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> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_42/Makefile.in | 1 + dlls/d3dx10_42/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index cc4f64347f1..2e61fcbc685 100755 --- a/configure +++ b/configure @@ -20387,6 +20387,7 @@ wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 wine_fn_config_makefile dlls/d3dx10_40 enable_d3dx10_40 wine_fn_config_makefile dlls/d3dx10_41 enable_d3dx10_41 wine_fn_config_makefile dlls/d3dx10_42 enable_d3dx10_42 +wine_fn_config_makefile dlls/d3dx10_42/tests enable_tests wine_fn_config_makefile dlls/d3dx10_43 enable_d3dx10_43 wine_fn_config_makefile dlls/d3dx10_43/tests enable_tests wine_fn_config_makefile dlls/d3dx11_42 enable_d3dx11_42 diff --git a/configure.ac b/configure.ac index cb8fa573c37..a9750330443 100644 --- a/configure.ac +++ b/configure.ac @@ -3087,6 +3087,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_42/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43) WINE_CONFIG_MAKEFILE(dlls/d3dx10_43/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx11_42) diff --git a/dlls/d3dx10_42/Makefile.in b/dlls/d3dx10_42/Makefile.in index 105bf3d4c93..e06f064cddc 100644 --- a/dlls/d3dx10_42/Makefile.in +++ b/dlls/d3dx10_42/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_42.dll +IMPORTLIB = d3dx10_42 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_42/tests/Makefile.in b/dlls/d3dx10_42/tests/Makefile.in new file mode 100644 index 00000000000..c3965b7c3f2 --- /dev/null +++ b/dlls/d3dx10_42/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_42.dll +IMPORTS = d3dx10_42 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0

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

Aug. 20, 2021

Module: wine Branch: master Commit: ef81cfb5fbc6d8f2b892c2782bdd469a5bb2f526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef81cfb5fbc6d8f2b892c278… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:41 2021 +0200 msvcrt: Move improper_lock implementation 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 | 39 ------------------------ dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 67 insertions(+), 49 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index a4df63d19a8..194cc707497 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -31,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +typedef exception cexception; +CREATE_EXCEPTION_OBJECT(cexception) + static int context_id = -1; static int scheduler_id = -1; @@ -296,6 +299,9 @@ typedef struct { CRITICAL_SECTION cs; } _ReentrantBlockingLock; +typedef exception improper_lock; +extern const vtable_ptr improper_lock_vtable; + enum ConcRT_EventType { CONCRT_EVENT_GENERIC, @@ -325,6 +331,41 @@ static HANDLE keyed_event; static void create_default_scheduler(void); +/* ??0improper_lock(a)Concurrency@@QAE(a)PBD@Z */ +/* ??0improper_lock(a)Concurrency@@QEAA(a)PEBD@Z */ +DEFINE_THISCALL_WRAPPER(improper_lock_ctor_str, 8) +improper_lock* __thiscall improper_lock_ctor_str(improper_lock *this, const char *str) +{ + TRACE("(%p %p)\n", this, str); + return __exception_ctor(this, str, &improper_lock_vtable); +} + +/* ??0improper_lock(a)Concurrency@@QAE(a)XZ */ +/* ??0improper_lock(a)Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(improper_lock_ctor, 4) +improper_lock* __thiscall improper_lock_ctor(improper_lock *this) +{ + return improper_lock_ctor_str(this, NULL); +} + +DEFINE_THISCALL_WRAPPER(improper_lock_copy_ctor,8) +improper_lock * __thiscall improper_lock_copy_ctor(improper_lock *this, const improper_lock *rhs) +{ + TRACE("(%p %p)\n", this, rhs); + return __exception_copy_ctor(this, rhs, &improper_lock_vtable); +} + +DEFINE_RTTI_DATA1(improper_lock, 0, &cexception_rtti_base_descriptor, + ".?AVimproper_lock(a)Concurrency@@") + +DEFINE_CXX_DATA1(improper_lock, &cexception_cxx_type_info, cexception_dtor) + +__ASM_BLOCK_BEGIN(concurrency_exception_vtables) + __ASM_VTABLE(improper_lock, + VTABLE_ADD_FUNC(cexception_vector_dtor) + VTABLE_ADD_FUNC(cexception_what)); +__ASM_BLOCK_END + static Context* try_get_current_context(void) { if (context_tls_index == TLS_OUT_OF_INDEXES) @@ -1433,8 +1474,11 @@ static inline void cs_lock(critical_section *cs, cs_queue *q) { cs_queue *last; - if(cs->unk_thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); + if(cs->unk_thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked"); + _CxxThrowException(&e, &improper_lock_exception_type); + } memset(q, 0, sizeof(*q)); last = InterlockedExchangePointer(&cs->tail, q); @@ -1540,8 +1584,11 @@ bool __thiscall critical_section_try_lock_for( TRACE("(%p %d)\n", this, timeout); - if(this->unk_thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); + if(this->unk_thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked"); + _CxxThrowException(&e, &improper_lock_exception_type); + } if(!(q = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*q)))) return critical_section_try_lock(this); @@ -2131,8 +2178,11 @@ void __thiscall reader_writer_lock_lock(reader_writer_lock *this) TRACE("(%p)\n", this); - if (this->thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked"); + if (this->thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked"); + _CxxThrowException(&e, &improper_lock_exception_type); + } last = InterlockedExchangePointer((void**)&this->writer_tail, &q); if (last) { @@ -2162,8 +2212,11 @@ void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) TRACE("(%p)\n", this); - if (this->thread_id == GetCurrentThreadId()) - throw_exception(EXCEPTION_IMPROPER_LOCK, 0, "Already locked as writer"); + if (this->thread_id == GetCurrentThreadId()) { + improper_lock e; + improper_lock_ctor_str(&e, "Already locked as writer"); + _CxxThrowException(&e, &improper_lock_exception_type); + } do { q.next = this->reader_head; @@ -2436,7 +2489,7 @@ DEFINE_RTTI_DATA1(SchedulerBase, 0, &Scheduler_rtti_base_descriptor, ".?AVSchedu DEFINE_RTTI_DATA2(ThreadScheduler, 0, &SchedulerBase_rtti_base_descriptor, &Scheduler_rtti_base_descriptor, ".?AVThreadScheduler(a)details@Concurrency@@") -__ASM_BLOCK_BEGIN(scheduler_vtables) +__ASM_BLOCK_BEGIN(concurrency_vtables) __ASM_VTABLE(ExternalContextBase, VTABLE_ADD_FUNC(ExternalContextBase_GetId) VTABLE_ADD_FUNC(ExternalContextBase_GetVirtualProcessorId) @@ -2470,12 +2523,17 @@ __ASM_BLOCK_END void msvcrt_init_concurrency(void *base) { #ifdef __x86_64__ + init_cexception_rtti(base); + init_improper_lock_rtti(base); init_Context_rtti(base); init_ContextBase_rtti(base); init_ExternalContextBase_rtti(base); init_Scheduler_rtti(base); init_SchedulerBase_rtti(base); init_ThreadScheduler_rtti(base); + + init_cexception_cxx_type_info(base); + init_improper_lock_cxx(base); #endif } diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 980b580c71e..fcdefd5512f 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -602,33 +602,6 @@ HRESULT __thiscall scheduler_resource_allocation_error_get_error_code( return this->hr; } -typedef exception improper_lock; -extern const vtable_ptr improper_lock_vtable; - -/* ??0improper_lock(a)Concurrency@@QAE(a)PBD@Z */ -/* ??0improper_lock(a)Concurrency@@QEAA(a)PEBD@Z */ -DEFINE_THISCALL_WRAPPER(improper_lock_ctor_str, 8) -improper_lock* __thiscall improper_lock_ctor_str(improper_lock *this, const char *str) -{ - TRACE("(%p %p)\n", this, str); - return __exception_ctor(this, str, &improper_lock_vtable); -} - -/* ??0improper_lock(a)Concurrency@@QAE(a)XZ */ -/* ??0improper_lock(a)Concurrency@@QEAA(a)XZ */ -DEFINE_THISCALL_WRAPPER(improper_lock_ctor, 4) -improper_lock* __thiscall improper_lock_ctor(improper_lock *this) -{ - return improper_lock_ctor_str(this, NULL); -} - -DEFINE_THISCALL_WRAPPER(improper_lock_copy_ctor,8) -improper_lock * __thiscall improper_lock_copy_ctor(improper_lock * _this, const improper_lock * rhs) -{ - TRACE("(%p %p)\n", _this, rhs); - return __exception_copy_ctor(_this, rhs, &improper_lock_vtable); -} - typedef exception invalid_scheduler_policy_key; extern const vtable_ptr invalid_scheduler_policy_key_vtable; @@ -804,9 +777,6 @@ __ASM_VTABLE(__non_rtti_object, __ASM_VTABLE(scheduler_resource_allocation_error, VTABLE_ADD_FUNC(exception_vector_dtor) VTABLE_ADD_FUNC(exception_what)); -__ASM_VTABLE(improper_lock, - VTABLE_ADD_FUNC(exception_vector_dtor) - VTABLE_ADD_FUNC(exception_what)); __ASM_VTABLE(invalid_scheduler_policy_key, VTABLE_ADD_FUNC(exception_vector_dtor) VTABLE_ADD_FUNC(exception_what)); @@ -840,7 +810,6 @@ DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exce #if _MSVCR_VER >= 100 DEFINE_RTTI_DATA1(scheduler_resource_allocation_error, 0, &exception_rtti_base_descriptor, ".?AVscheduler_resource_allocation_error(a)Concurrency@@") -DEFINE_RTTI_DATA1(improper_lock, 0, &exception_rtti_base_descriptor, ".?AVimproper_lock(a)Concurrency@@" ) DEFINE_RTTI_DATA1(invalid_scheduler_policy_key, 0, &exception_rtti_base_descriptor, ".?AVinvalid_scheduler_policy_key(a)Concurrency@@" ) DEFINE_RTTI_DATA1(invalid_scheduler_policy_value, 0, &exception_rtti_base_descriptor, @@ -863,7 +832,6 @@ DEFINE_CXX_DATA1( bad_alloc, &exception_cxx_type_info, bad_alloc_dtor ) #endif #if _MSVCR_VER >= 100 DEFINE_CXX_DATA1(scheduler_resource_allocation_error, &exception_cxx_type_info, exception_dtor) -DEFINE_CXX_DATA1(improper_lock, &exception_cxx_type_info, exception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_key, &exception_cxx_type_info, exception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_value, &exception_cxx_type_info, exception_dtor) DEFINE_CXX_DATA1(invalid_scheduler_policy_thread_specification, &exception_cxx_type_info, exception_dtor) @@ -885,7 +853,6 @@ void msvcrt_init_exception(void *base) init___non_rtti_object_rtti(base); #if _MSVCR_VER >= 100 init_scheduler_resource_allocation_error_rtti(base); - init_improper_lock_rtti(base); init_invalid_scheduler_policy_key_rtti(base); init_invalid_scheduler_policy_value_rtti(base); init_invalid_scheduler_policy_thread_specification_rtti(base); @@ -902,7 +869,6 @@ void msvcrt_init_exception(void *base) #endif #if _MSVCR_VER >= 100 init_scheduler_resource_allocation_error_cxx(base); - init_improper_lock_cxx(base); init_invalid_scheduler_policy_key_cxx(base); init_invalid_scheduler_policy_value_cxx(base); init_invalid_scheduler_policy_thread_specification_cxx(base); @@ -927,11 +893,6 @@ void throw_exception(exception_type et, HRESULT hr, const char *str) scheduler_resource_allocation_error_ctor_name(&e, str, hr); _CxxThrowException(&e.e, &scheduler_resource_allocation_error_exception_type); } - case EXCEPTION_IMPROPER_LOCK: { - improper_lock e; - improper_lock_ctor_str(&e, str); - _CxxThrowException(&e, &improper_lock_exception_type); - } case EXCEPTION_INVALID_SCHEDULER_POLICY_KEY: { invalid_scheduler_policy_key e; invalid_scheduler_policy_key_ctor_str(&e, str); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 51e9b9726db..2d779cc1f5c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -191,7 +191,6 @@ typedef enum { EXCEPTION_BAD_ALLOC, #if _MSVCR_VER >= 100 EXCEPTION_SCHEDULER_RESOURCE_ALLOCATION_ERROR, - EXCEPTION_IMPROPER_LOCK, EXCEPTION_INVALID_SCHEDULER_POLICY_KEY, EXCEPTION_INVALID_SCHEDULER_POLICY_VALUE, EXCEPTION_INVALID_SCHEDULER_POLICY_THREAD_SPECIFICATION,

1 0