Module: wine Branch: master Commit: cab51a0546cfd389802b3eb531ca2ce790cd05c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab51a0546cfd389802b3eb531...
Author: Piotr Caban piotr@codeweavers.com Date: Wed Dec 1 21:14:23 2010 +0100
msvcrt: Added _get_terminate implementation.
---
dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/cpp.c | 10 ++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4cd7f3a..1c2c66f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -688,7 +688,7 @@ @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler -@ stub _get_terminate +@ cdecl _get_terminate() msvcrt._get_terminate @ stub _get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ stub _get_unexpected diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ab74956..8ab1835 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -533,7 +533,7 @@ @ stub _get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold -@ stub _get_terminate +@ cdecl _get_terminate() msvcrt._get_terminate @ stub _get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ stub _get_unexpected diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e6da0da..f1a2bde 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -523,7 +523,7 @@ @ stub _get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold -@ stub _get_terminate +@ cdecl _get_terminate() msvcrt._get_terminate @ stub _get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ stub _get_unexpected diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index c3e6ec8..4d0f5d5 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1026,6 +1026,16 @@ MSVCRT_terminate_function CDECL MSVCRT_set_terminate(MSVCRT_terminate_function f }
/****************************************************************** + * _get_terminate (MSVCRT.@) + */ +MSVCRT_terminate_function CDECL MSVCRT__get_terminate(void) +{ + thread_data_t *data = msvcrt_get_thread_data(); + TRACE("returning %p\n", data->terminate_handler); + return data->terminate_handler; +} + +/****************************************************************** * ?set_unexpected@@YAP6AXXZP6AXXZ@Z (MSVCRT.@) * * Install a handler to be called when unexpected() is called. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index efa380a..379b7cd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -481,7 +481,7 @@ # stub _get_winminor # stub _get_winver # stub _get_wpgmptr -@ stub _get_terminate +@ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ stub _get_unexpected @ cdecl _getch()