Gijs Vermeulen : msvcp100: Add Concurrency::_GetCombinableSize stub.
Alexandre Julliard
julliard at winehq.org
Sun Mar 3 13:21:29 CST 2019
Module: wine
Branch: oldstable
Commit: 21d030099ae8a099ffbdf94b906b1af48e50490f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d030099ae8a099ffbdf94b906b1af48e50490f
Author: Gijs Vermeulen <gijsvrm at gmail.com>
Date: Thu Nov 1 17:52:31 2018 +0100
msvcp100: Add Concurrency::_GetCombinableSize stub.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41419
Signed-off-by: Gijs Vermeulen <gijsvrm at gmail.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 82ba4373ae84ebe51d649dfe416af8b31097d62a)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/concrt140/concrt140.spec | 4 ++--
dlls/msvcp100/msvcp100.spec | 4 ++--
dlls/msvcp110/msvcp110.spec | 4 ++--
dlls/msvcp120/msvcp120.spec | 4 ++--
dlls/msvcp120_app/msvcp120_app.spec | 4 ++--
dlls/msvcp90/misc.c | 8 ++++++++
6 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec
index 7234a3f..0ce01fe 100644
--- a/dlls/concrt140/concrt140.spec
+++ b/dlls/concrt140/concrt140.spec
@@ -336,8 +336,8 @@
@ thiscall -arch=i386 ?_DoYield@?$_SpinWait@$0A@@details at Concurrency@@IAEXXZ(ptr) msvcr120.?_DoYield@?$_SpinWait@$0A@@details at Concurrency@@IAEXXZ
@ cdecl -arch=win64 ?_DoYield@?$_SpinWait@$0A@@details at Concurrency@@IEAAXXZ(ptr) msvcr120.?_DoYield@?$_SpinWait@$0A@@details at Concurrency@@IEAAXXZ
@ cdecl ?_Get at _CurrentScheduler@details at Concurrency@@SA?AV_Scheduler at 23@XZ(ptr) msvcr120.?_Get at _CurrentScheduler@details at Concurrency@@SA?AV_Scheduler at 23@XZ
-@ stub -arch=win32 ?_GetCombinableSize at details@Concurrency@@YAIXZ
-@ stub -arch=win64 ?_GetCombinableSize at details@Concurrency@@YA_KXZ
+@ cdecl -arch=win32 ?_GetCombinableSize at details@Concurrency@@YAIXZ() msvcp120.?_GetCombinableSize at details@Concurrency@@YAIXZ
+@ cdecl -arch=win64 ?_GetCombinableSize at details@Concurrency@@YA_KXZ() msvcp120.?_GetCombinableSize at details@Concurrency@@YA_KXZ
@ stub -arch=win32 ?_GetConcRTTraceInfo at Concurrency@@YAPBU_CONCRT_TRACE_INFO at details@1 at XZ
@ stub -arch=win64 ?_GetConcRTTraceInfo at Concurrency@@YAPEBU_CONCRT_TRACE_INFO at details@1 at XZ
@ cdecl ?_GetConcurrency at details@Concurrency@@YAIXZ() msvcr120.?_GetConcurrency at details@Concurrency@@YAIXZ
diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec
index 0d6e6dc..b5f44c4 100644
--- a/dlls/msvcp100/msvcp100.spec
+++ b/dlls/msvcp100/msvcp100.spec
@@ -821,8 +821,8 @@
@ cdecl -arch=win64 ?_Fput@?$num_put at GV?$ostreambuf_iterator at GU?$char_traits at G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at GU?$char_traits at G@std@@@2 at V32@AEAVios_base at 2@GPEBD_K333 at Z(ptr ptr ptr ptr long str long long long long) num_put_short__Fput
@ cdecl -arch=win32 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AAVios_base at 2@_WPBDIIII at Z(ptr ptr long ptr ptr long str long long long long) num_put_wchar__Fput
@ cdecl -arch=win64 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AEAVios_base at 2@_WPEBD_K444 at Z(ptr ptr ptr ptr long str long long long long) num_put_wchar__Fput
-@ stub -arch=win32 ?_GetCombinableSize at details@Concurrency@@YAIXZ
-@ stub -arch=win64 ?_GetCombinableSize at details@Concurrency@@YA_KXZ
+@ cdecl -arch=win32 ?_GetCombinableSize at details@Concurrency@@YAIXZ() _GetCombinableSize
+@ cdecl -arch=win64 ?_GetCombinableSize at details@Concurrency@@YA_KXZ() _GetCombinableSize
@ stub ?_GetCurrentThreadId at details@Concurrency@@YAKXZ
@ cdecl -arch=win32 ?_Getcat@?$codecvt at DDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z(ptr ptr) codecvt_char__Getcat
@ cdecl -arch=win64 ?_Getcat@?$codecvt at DDH@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z(ptr ptr) codecvt_char__Getcat
diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec
index 25ae3d4..1112c5a 100644
--- a/dlls/msvcp110/msvcp110.spec
+++ b/dlls/msvcp110/msvcp110.spec
@@ -1227,8 +1227,8 @@
@ cdecl -arch=win64 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AEAVios_base at 2@_WPEBD_K444 at Z(ptr ptr ptr ptr long str long long long long) num_put_wchar__Fput
@ stub -arch=win32 ?_Future_error_map at std@@YAPBDH at Z
@ stub -arch=win64 ?_Future_error_map at std@@YAPEBDH at Z
-@ stub -arch=win32 ?_GetCombinableSize at details@Concurrency@@YAIXZ
-@ stub -arch=win64 ?_GetCombinableSize at details@Concurrency@@YA_KXZ
+@ cdecl -arch=win32 ?_GetCombinableSize at details@Concurrency@@YAIXZ() _GetCombinableSize
+@ cdecl -arch=win64 ?_GetCombinableSize at details@Concurrency@@YA_KXZ() _GetCombinableSize
@ stub ?_GetCurrentThreadId at details@Concurrency@@YAKXZ
@ stub ?_GetNextAsyncId at details@Concurrency@@YAIXZ
@ stub -arch=win32 ?_Get_future_error_what at std@@YAPBDH at Z
diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec
index dd25c9f..2e691d4 100644
--- a/dlls/msvcp120/msvcp120.spec
+++ b/dlls/msvcp120/msvcp120.spec
@@ -1192,8 +1192,8 @@
@ cdecl -arch=win64 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AEAVios_base at 2@_WPEBD_K444 at Z(ptr ptr ptr ptr long str long long long long) num_put_wchar__Fput
@ stub -arch=win32 ?_Future_error_map at std@@YAPBDH at Z
@ stub -arch=win64 ?_Future_error_map at std@@YAPEBDH at Z
-@ stub -arch=win32 ?_GetCombinableSize at details@Concurrency@@YAIXZ
-@ stub -arch=win64 ?_GetCombinableSize at details@Concurrency@@YA_KXZ
+@ cdecl -arch=win32 ?_GetCombinableSize at details@Concurrency@@YAIXZ() _GetCombinableSize
+@ cdecl -arch=win64 ?_GetCombinableSize at details@Concurrency@@YA_KXZ() _GetCombinableSize
@ cdecl -arch=win32 ?_Getcat@?$codecvt at DDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z(ptr ptr) codecvt_char__Getcat
@ cdecl -arch=win64 ?_Getcat@?$codecvt at DDH@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z(ptr ptr) codecvt_char__Getcat
@ cdecl -arch=win32 ?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z(ptr ptr) codecvt_short__Getcat
diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec
index 6f599b6..4c6df37 100644
--- a/dlls/msvcp120_app/msvcp120_app.spec
+++ b/dlls/msvcp120_app/msvcp120_app.spec
@@ -1192,8 +1192,8 @@
@ cdecl -arch=win64 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AEAVios_base at 2@_WPEBD_K444 at Z(ptr ptr ptr ptr long str long long long long) msvcp120.?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AEAVios_base at 2@_WPEBD_K444 at Z
@ stub -arch=win32 ?_Future_error_map at std@@YAPBDH at Z
@ stub -arch=win64 ?_Future_error_map at std@@YAPEBDH at Z
-@ stub -arch=win32 ?_GetCombinableSize at details@Concurrency@@YAIXZ
-@ stub -arch=win64 ?_GetCombinableSize at details@Concurrency@@YA_KXZ
+@ cdecl -arch=win32 ?_GetCombinableSize at details@Concurrency@@YAIXZ() msvcp120.?_GetCombinableSize at details@Concurrency@@YAIXZ
+@ cdecl -arch=win64 ?_GetCombinableSize at details@Concurrency@@YA_KXZ() msvcp120.?_GetCombinableSize at details@Concurrency@@YA_KXZ
@ cdecl -arch=win32 ?_Getcat@?$codecvt at DDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z(ptr ptr) msvcp120.?_Getcat@?$codecvt at DDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z
@ cdecl -arch=win64 ?_Getcat@?$codecvt at DDH@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z(ptr ptr) msvcp120.?_Getcat@?$codecvt at DDH@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z
@ cdecl -arch=win32 ?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z(ptr ptr) msvcp120.?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z
diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c
index 7a682b6..89dfc45 100644
--- a/dlls/msvcp90/misc.c
+++ b/dlls/msvcp90/misc.c
@@ -1852,6 +1852,14 @@ MSVCP_bool __cdecl is_current_task_group_canceling(void)
{
return Context_IsCurrentTaskCollectionCanceling();
}
+
+/* ?_GetCombinableSize at details@Concurrency@@YAIXZ */
+/* ?_GetCombinableSize at details@Concurrency@@YA_KXZ */
+MSVCP_size_t __cdecl _GetCombinableSize(void)
+{
+ FIXME("() stub\n");
+ return 11;
+}
#endif
#if _MSVCP_VER >= 140
More information about the wine-cvs
mailing list