Daniel Lehman : msvcrt: Add _Trace_ppl_function stub.

Alexandre Julliard julliard at winehq.org
Mon Mar 20 17:16:45 CDT 2017


Module: wine
Branch: master
Commit: 4db4d61bbb1a89b5f87ecb8efe32b3c31b863e2a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4db4d61bbb1a89b5f87ecb8efe32b3c31b863e2a

Author: Daniel Lehman <dlehman at esri.com>
Date:   Thu Sep 29 16:57:04 2016 -0700

msvcrt: Add _Trace_ppl_function stub.

Signed-off-by: Daniel Lehman <dlehman at esri.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/concrt140/concrt140.spec       |  4 ++--
 dlls/msvcr100/msvcr100.spec         |  4 ++--
 dlls/msvcr110/msvcr110.spec         |  4 ++--
 dlls/msvcr120/msvcr120.spec         |  4 ++--
 dlls/msvcr120_app/msvcr120_app.spec |  4 ++--
 dlls/msvcrt/cpp.c                   | 21 +++++++++++++++++++++
 6 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec
index 855e366..e6ebe4e 100644
--- a/dlls/concrt140/concrt140.spec
+++ b/dlls/concrt140/concrt140.spec
@@ -456,8 +456,8 @@
 @ stub -arch=i386 ?_Stop at _Timer@details at Concurrency@@IAEXXZ
 @ stub -arch=win64 ?_Stop at _Timer@details at Concurrency@@IEAAXXZ
 @ stub -arch=win64 ?_Trace_agents at Concurrency@@YAXW4Agents_EventType at 1@_JZZ
-@ stub ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z
-@ stub ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z
+@ cdecl -arch=win32 ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z(ptr long long) msvcr120.?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z
+@ cdecl -arch=win64 ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z(ptr long long) msvcr120.?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z
 @ thiscall -arch=i386 ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAE_NXZ
 @ cdecl -arch=win64 ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QEAA_NXZ(ptr) msvcr120.?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QEAA_NXZ
 @ thiscall -arch=i386 ?_TryAcquire at _ReentrantBlockingLock@details at Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire at _ReentrantBlockingLock@details at Concurrency@@QAE_NXZ
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index d60c2c2..303e1b7 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -386,8 +386,8 @@
 @ stub -arch=win64 ?_Stop at _Timer@details at Concurrency@@IEAAXXZ
 @ stub -arch=win32 ?_Tidy at exception@std@@AAEXXZ
 @ stub -arch=win64 ?_Tidy at exception@std@@AEAAXXZ
-@ stub -arch=win32 ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z
-@ stub -arch=win64 ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z
+@ cdecl -arch=win32 ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z(ptr long long) Concurrency__Trace_ppl_function
+@ cdecl -arch=win64 ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z(ptr long long) Concurrency__Trace_ppl_function
 @ thiscall -arch=win32 ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire
 @ cdecl -arch=win64 ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire
 @ thiscall -arch=win32 ?_TryAcquire at _ReentrantBlockingLock@details at Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index f9b6613..8aa390e 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -658,8 +658,8 @@
 @ stub -arch=i386 ?_Tidy at exception@std@@AAEXXZ
 @ stub -arch=win64 ?_Tidy at exception@std@@AEAAXXZ
 @ stub ?_Trace_agents at Concurrency@@YAXW4Agents_EventType at 1@_JZZ
-@ stub -arch=win32 ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z
-@ stub -arch=win64 ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z
+@ cdecl -arch=win32 ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z(ptr long long) Concurrency__Trace_ppl_function
+@ cdecl -arch=win64 ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z(ptr long long) Concurrency__Trace_ppl_function
 @ cdecl -arch=arm ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire
 @ thiscall -arch=i386 ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire
 @ cdecl -arch=win64 ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 48129f6..7a3a831 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -640,8 +640,8 @@
 @ stub -arch=i386 ?_Tidy at exception@std@@AAEXXZ
 @ stub -arch=win64 ?_Tidy at exception@std@@AEAAXXZ
 @ stub ?_Trace_agents at Concurrency@@YAXW4Agents_EventType at 1@_JZZ
-@ stub -arch=win32 ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z
-@ stub -arch=win64 ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z
+@ cdecl -arch=win32 ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z(ptr long long) Concurrency__Trace_ppl_function
+@ cdecl -arch=win64 ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z(ptr long long) Concurrency__Trace_ppl_function
 @ cdecl -arch=arm ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire
 @ thiscall -arch=i386 ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire
 @ cdecl -arch=win64 ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 7242cb9..62926d4 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -636,8 +636,8 @@
 @ stub -arch=i386 ?_Tidy at exception@std@@AAEXXZ
 @ stub -arch=win64 ?_Tidy at exception@std@@AEAAXXZ
 @ stub ?_Trace_agents at Concurrency@@YAXW4Agents_EventType at 1@_JZZ
-@ stub -arch=win32 ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z
-@ stub -arch=win64 ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z
+@ cdecl -arch=win32 ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z(ptr long long) msvcr120.?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z
+@ cdecl -arch=win64 ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z(ptr long long) msvcr120.?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z
 @ cdecl -arch=arm ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAA_NXZ(ptr) msvcr120.?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAA_NXZ
 @ thiscall -arch=i386 ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QAE_NXZ
 @ cdecl -arch=win64 ?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QEAA_NXZ(ptr) msvcr120.?_TryAcquire at _NonReentrantBlockingLock@details at Concurrency@@QEAA_NXZ
diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index daf7aee..a86048a 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -1700,3 +1700,24 @@ MSVCRT_size_t CDECL MSVCRT_type_info_hash(const type_info140 *ti)
     return hash;
 }
 #endif
+
+#if _MSVCR_VER >= 100
+enum ConcRT_EventType
+{
+    CONCRT_EVENT_GENERIC,
+    CONCRT_EVENT_START,
+    CONCRT_EVENT_END,
+    CONCRT_EVENT_BLOCK,
+    CONCRT_EVENT_UNBLOCK,
+    CONCRT_EVENT_YIELD,
+    CONCRT_EVENT_ATTACH,
+    CONCRT_EVENT_DETACH
+};
+
+/* ?_Trace_ppl_function at Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType at 1@@Z */
+/* ?_Trace_ppl_function at Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType at 1@@Z */
+void __cdecl Concurrency__Trace_ppl_function(const GUID *guid, unsigned char level, enum ConcRT_EventType type)
+{
+    FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type);
+}
+#endif




More information about the wine-cvs mailing list