Gijs Vermeulen : msvcp100: Add stub for Concurrency:: is_current_task_group_canceling.
Module: wine Branch: master Commit: 7f1044f212447c6ab520e87cc929d8f3484146be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1044f212447c6ab520e87cc9... Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Mar 22 10:55:17 2017 +0100 msvcp100: Add stub for Concurrency::is_current_task_group_canceling. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++++++++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 51ac8fe..9aa59be 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -477,7 +477,7 @@ @ stub ?from_numa_node(a)location@Concurrency@@SA?AV12(a)G@Z @ stub -arch=i386 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QBEJXZ @ stub -arch=win64 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QEBAJXZ -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ @ thiscall -arch=i386 ?lock(a)critical_section@Concurrency@@QAEXXZ(ptr) msvcr120.?lock(a)critical_section@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?lock(a)critical_section@Concurrency@@QEAAXXZ(ptr) msvcr120.?lock(a)critical_section@Concurrency@@QEAAXXZ @ thiscall -arch=win32 ?lock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?lock(a)reader_writer_lock@Concurrency@@QAEXXZ diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index a50c2f5..6841678 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2068,7 +2068,7 @@ @ extern ?is_bounded(a)_Num_base@std@@2_NB std_Num_base_is_bounded @ extern ?is_bounded(a)_Num_float_base@std@@2_NB std_Num_float_base_is_bounded @ extern ?is_bounded(a)_Num_int_base@std@@2_NB std_Num_int_base_is_bounded -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling @ extern ?is_exact(a)_Num_base@std@@2_NB std_Num_base_is_exact @ extern ?is_exact(a)_Num_float_base@std@@2_NB std_Num_float_base_is_exact @ extern ?is_exact(a)_Num_int_base@std@@2_NB std_Num_int_base_is_exact diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a7c3297..602cb2b 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2832,7 +2832,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling @ stub ?is_task_cancellation_requested(a)Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 61d4b32..a839575 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx @ cdecl -arch=win64 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index f649bbc..6bc6e5a 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ @ cdecl -arch=win64 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index fad324e..81a6f81 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1400,6 +1400,16 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) } #endif +/* ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ */ +MSVCP_bool __cdecl is_current_task_group_canceling(void *this) +{ + static int once; + + if (!once++) + FIXME("(%p) stub\n", this); + return FALSE; +} + #if _MSVCP_VER >= 140 typedef struct { void *unk0;
participants (1)
-
Alexandre Julliard