Module: wine Branch: master Commit: 2a65d21d1a873cf14c0ad03dd2b53ebd760fe5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a65d21d1a873cf14c0ad03dd2...
Author: Daniel Lehman dlehman@esri.com Date: Mon Mar 28 13:12:02 2016 -0700
msvcp120: Add _Mtx_current_owns.
Signed-off-by: Daniel Lehman dlehman@esri.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 87b2392..ee2d62f 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3818,7 +3818,7 @@ @ stub _Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner -@ stub _Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) @ cdecl _Mtx_destroy(ptr) @ cdecl _Mtx_getconcrtcs(ptr) @ cdecl _Mtx_init(ptr long) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 8fdd4e7..ddb28c4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3763,7 +3763,7 @@ @ stub _Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner -@ stub _Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) @ cdecl _Mtx_destroy(ptr) @ cdecl _Mtx_getconcrtcs(ptr) @ cdecl _Mtx_init(ptr long) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 12a92fd..4027066 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3763,7 +3763,7 @@ @ stub _Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) msvcp120._Mbrtowc @ stub _Mtx_clear_owner -@ stub _Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) msvcp120._Mtx_current_owns @ cdecl _Mtx_destroy(ptr) msvcp120._Mtx_destroy @ cdecl _Mtx_getconcrtcs(ptr) msvcp120._Mtx_getconcrtcs @ cdecl _Mtx_init(ptr long) msvcp120._Mtx_init diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index a4713d2..a41d357 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -487,6 +487,11 @@ void __cdecl _Mtx_destroy(_Mtx_t *mtx) MSVCRT_operator_delete(*mtx); }
+int __cdecl _Mtx_current_owns(_Mtx_t *mtx) +{ + return (*mtx)->thread_id == GetCurrentThreadId(); +} + int __cdecl _Mtx_lock(_Mtx_t *mtx) { if((*mtx)->thread_id != GetCurrentThreadId()) {