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

Zebediah Figura : vkd3d-shader/hlsl: Write the SM4 ret instruction.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: vkd3d Branch: master Commit: 636ec273817e9b58c2bf622230a893466deb60f1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=636ec273817e9b58c2bf622… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:31 2021 -0500 vkd3d-shader/hlsl: Write the SM4 ret instruction. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a66bcaa..253aa24 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -775,6 +775,16 @@ static void write_sm4_dcl_temps(struct vkd3d_bytecode_buffer *buffer, uint32_t t write_sm4_instruction(buffer, &instr); } +static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) +{ + struct sm4_instruction instr = + { + .opcode = VKD3D_SM4_OP_RET, + }; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) { const struct hlsl_profile_info *profile = ctx->profile; @@ -813,6 +823,8 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) if (ctx->temp_count) write_sm4_dcl_temps(&buffer, ctx->temp_count); + write_sm4_ret(&buffer); + dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write the SHDR token count.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: vkd3d Branch: master Commit: 864e816de807de7ad5792e30673d9c86a8590126 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=864e816de807de7ad5792e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:32 2021 -0500 vkd3d-shader/hlsl: Write the SHDR token count. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 253aa24..1592767 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -791,6 +791,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) struct vkd3d_bytecode_buffer buffer = {0}; const struct hlsl_buffer *cbuffer; const struct hlsl_ir_var *var; + size_t token_count_position; static const uint16_t shader_types[VKD3D_SHADER_TYPE_COUNT] = { @@ -806,7 +807,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) }; put_u32(&buffer, vkd3d_make_u32((profile->major_version << 4) | profile->minor_version, shader_types[profile->type])); - put_u32(&buffer, 0); /* FIXME: instruction token count */ + token_count_position = put_u32(&buffer, 0); LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry) { @@ -825,6 +826,8 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) write_sm4_ret(&buffer); + set_u32(&buffer, token_count_position, bytecode_get_size(&buffer) / sizeof(uint32_t)); + dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use vkd3d_make_u32() in more places.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: vkd3d Branch: master Commit: 62c60776b95730eb0534aabc3f630c6ac810c051 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=62c60776b95730eb0534aab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:25 2021 -0500 vkd3d-shader/hlsl: Use vkd3d_make_u32() in more places. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 9f5c18d..38c7162 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -163,9 +163,9 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b } } - type->bytecode_offset = put_u32(buffer, sm4_class(type) | (sm4_base_type(type) << 16)); - put_u32(buffer, type->dimy | (type->dimx << 16)); - put_u32(buffer, array_size | (field_count << 16)); + type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(sm4_class(type), sm4_base_type(type))); + put_u32(buffer, vkd3d_make_u32(type->dimy, type->dimx)); + put_u32(buffer, vkd3d_make_u32(array_size, field_count)); put_u32(buffer, fields_offset); if (profile->major_version >= 5) @@ -207,7 +207,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) cbuffer_position = put_u32(&buffer, 0); put_u32(&buffer, cbuffer_count); /* bound resource count */ resource_position = put_u32(&buffer, 0); - put_u32(&buffer, (target_types[profile->type] << 16) | (profile->major_version << 8) | profile->minor_version); + put_u32(&buffer, vkd3d_make_u32(vkd3d_make_u16(profile->minor_version, profile->major_version), + target_types[profile->type])); put_u32(&buffer, 0); /* FIXME: compilation flags */ creator_position = put_u32(&buffer, 0); @@ -371,7 +372,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) VKD3D_SM4_LIB, }; - put_u32(&buffer, (shader_types[profile->type] << 16) | (profile->major_version << 4) | profile->minor_version); + put_u32(&buffer, vkd3d_make_u32((profile->major_version << 4) | profile->minor_version, shader_types[profile->type])); put_u32(&buffer, 0); /* FIXME: instruction token count */ dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size);

1 0

Zebediah Figura : include: Update the D3D_SHADER_VARIABLE_TYPE enumeration.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: vkd3d Branch: master Commit: 486c525dc1185ed2a27c2e847135c5ece51b69f4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=486c525dc1185ed2a27c2e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 19 18:44:26 2021 -0500 include: Update the D3D_SHADER_VARIABLE_TYPE enumeration. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3dcommon.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index 0359a74..ed6f270 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -191,6 +191,12 @@ typedef enum _D3D_SHADER_VARIABLE_TYPE D3D_SVT_RWSTRUCTURED_BUFFER, D3D_SVT_APPEND_STRUCTURED_BUFFER, D3D_SVT_CONSUME_STRUCTURED_BUFFER, + D3D_SVT_MIN8FLOAT, + D3D_SVT_MIN10FLOAT, + D3D_SVT_MIN16FLOAT, + D3D_SVT_MIN12INT, + D3D_SVT_MIN16INT, + D3D_SVT_MIN16UINT, D3D_SVT_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_TYPE;

1 0

Julian Rüger : German translation for release 6.13.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: website Branch: master Commit: e8af1f8cf19a2e426be4d5a13a5d9412bf1db491 URL: https://source.winehq.org/git/website.git/?a=commit;h=e8af1f8cf19a2e426be4d… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 23 14:03:52 2021 +0200 German translation for release 6.13. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021072001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2021072001.xml b/news/de/2021072001.xml new file mode 100644 index 00000000..c964fb5c --- /dev/null +++ b/news/de/2021072001.xml @@ -0,0 +1,17 @@ +<news> +<date>20. Juli 2021</date> +<title>Wine 6.13 freigegeben</title> +<body> + Die Entwicklungsversion 6.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Korrektes Theming von Scrollleisten.</li> + <li>Fortschritte Richtung PE-Konversion von WinSock.</li> + <li>Vorbereitungsarbeit für eine GDI-Syscall-Schnittstelle.</li> + <li>Kleinere Fortschritte der PE-Konversion von IPHLPAPI.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.13.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.14.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: website Branch: master Commit: 71b903a9e3ff256dc6614fc4a1162b633be7b6a4 URL: https://source.winehq.org/git/website.git/?a=commit;h=71b903a9e3ff256dc6614… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 23 14:06:52 2021 +0200 German translation for release 6.14. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021073001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2021073001.xml b/news/de/2021073001.xml new file mode 100644 index 00000000..c3d4ba44 --- /dev/null +++ b/news/de/2021073001.xml @@ -0,0 +1,16 @@ +<news> +<date>30. Juli 2021</date> +<title>Wine 6.14 freigegeben</title> +<body> + Die Entwicklungsversion 6.14 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.14">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mono-Engine auf Version 6.3.0 aktualisiert, inkl. Neuerungen des Upstream-Projekts.</li> + <li>32->64-Bit-Thunks in WoW64-DLL implementiert.</li> + <li>Weitere Vorbereitung auf die GDI-Syscall-Schnittstelle.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.14.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 6.15.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: website Branch: master Commit: 270b80c1a91d55a5774fa1bd9692c9d9bf87fab8 URL: https://source.winehq.org/git/website.git/?a=commit;h=270b80c1a91d55a5774fa… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Aug 23 14:11:44 2021 +0200 German translation for release 6.15. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2021081301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2021081301.xml b/news/de/2021081301.xml new file mode 100644 index 00000000..f8714f08 --- /dev/null +++ b/news/de/2021081301.xml @@ -0,0 +1,18 @@ +<news> +<date>13. August 2021</date> +<title>Wine 6.15 freigegeben</title> +<body> + Die Entwicklungsversion 6.15 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/6.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>WinSock-Bibliothek (WS2_32) nach PE konvertiert.</li> + <li>Unterstützung von Performance-Daten in der Registrierung.</li> + <li>Weitere 32->64-Bit-Thunks für NTDLL-Aufrufe.</li> + <li>Verbesserter Umgang mit Fließkommastatus in der C-Laufzeit.</li> + <li>Weitere Vorbereitung auf die GDI-Syscall-Schnittstelle.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> + +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.x/wine-6.15.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : winetest: Add support for Windows 10 21H1.
by Alexandre Julliard 23 Aug '21

23 Aug '21

Module: tools Branch: master Commit: c4e7c4c25975028fb7cae6778694e2c4bc98efa8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c4e7c4c25975028fb7cae67… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Aug 22 14:52:12 2021 +0200 winetest: Add support for Windows 10 21H1. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 2 +- winetest/winetest.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index a11c3de..2ee5d5b 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -426,7 +426,7 @@ my %platform_order = ( win1709 => 1709, win1803 => 1803, win1809 => 1809, win1903 => 1903, win1909 => 1909, win2004 => 2004, - win2009 => 2009, + win2009 => 2009, win21H1 => 2101, win10 => 2100, # for backward compatibility wine => 3000, linux => 3001, mac => 3001, bsd => 3002, solaris => 3003 diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 5ac2261..3db146a 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -50,7 +50,7 @@ $fixed_threshold = 0.99; { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, { name => "Win1909+", ids => [ "win1909" ] }, { name => "Win10", ids => [ "win2009", "win10" ] }, # win10 for backward compatibility - { name => "Win10L", ids => [ "win2004" ] }, + { name => "Win10L", ids => [ "win2004", "win21H1" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] }, { name => "Mac", ids => [ "mac" ] },

1 0

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

20 Aug '21

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

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

20 Aug '21

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