[PATCH] msvcrt: Added _get_purecall_handler()

Nikolay Sivov nsivov at codeweavers.com
Fri Nov 24 12:17:08 CST 2017


Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---

For https://bugs.winehq.org/show_bug.cgi?id=44064

 .../api-ms-win-crt-private-l1-1-0.spec                           | 2 +-
 dlls/msvcr100/msvcr100.spec                                      | 2 +-
 dlls/msvcr110/msvcr110.spec                                      | 2 +-
 dlls/msvcr120/msvcr120.spec                                      | 2 +-
 dlls/msvcr120_app/msvcr120_app.spec                              | 2 +-
 dlls/msvcr80/msvcr80.spec                                        | 2 +-
 dlls/msvcr90/msvcr90.spec                                        | 2 +-
 dlls/msvcrt/exit.c                                               | 9 +++++++++
 dlls/ucrtbase/ucrtbase.spec                                      | 2 +-
 dlls/vcruntime140/vcruntime140.spec                              | 2 +-
 10 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec
index 2ce5311e29..5e67f92d56 100644
--- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec
@@ -55,7 +55,7 @@
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2
 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3
 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common
-@ stub _get_purecall_handler
+@ cdecl _get_purecall_handler() ucrtbase._get_purecall_handler
 @ cdecl _get_unexpected() ucrtbase._get_unexpected
 @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2
 @ stub _is_exception_typeof
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index a04bedfbf8..685e11bd74 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -883,7 +883,7 @@
 @ cdecl _get_output_format() MSVCRT__get_output_format
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
-@ stub _get_purecall_handler
+@ cdecl _get_purecall_handler()
 @ cdecl _get_terminate() MSVCRT__get_terminate
 @ cdecl _get_timezone(ptr)
 @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index a0aebc047c..ae866784d6 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1230,7 +1230,7 @@
 @ cdecl _get_output_format() MSVCRT__get_output_format
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
-@ stub _get_purecall_handler
+@ cdecl _get_purecall_handler()
 @ cdecl _get_terminate() MSVCRT__get_terminate
 @ cdecl _get_timezone(ptr)
 @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index b7c31599c6..969451febc 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1230,7 +1230,7 @@
 @ cdecl _get_output_format() MSVCRT__get_output_format
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
-@ stub _get_purecall_handler
+@ cdecl _get_purecall_handler()
 @ cdecl _get_terminate() MSVCRT__get_terminate
 @ cdecl _get_timezone(ptr)
 @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index cd8554c77e..8c3d96e41e 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1158,7 +1158,7 @@
 @ cdecl _get_output_format() msvcr120._get_output_format
 @ cdecl _get_pgmptr(ptr) msvcr120._get_pgmptr
 @ cdecl _get_printf_count_output() msvcr120._get_printf_count_output
-@ stub _get_purecall_handler
+@ cdecl _get_purecall_handler() msvcr120._get_purecall_handler
 @ cdecl _get_terminate() msvcr120._get_terminate
 @ cdecl _get_timezone(ptr) msvcr120._get_timezone
 @ cdecl _get_tzname(ptr str long long) msvcr120._get_tzname
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index d9c29fd09b..dd80131464 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -552,7 +552,7 @@
 @ cdecl _get_output_format() MSVCRT__get_output_format
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
-@ stub _get_purecall_handler
+@ cdecl _get_purecall_handler()
 @ cdecl _get_sbh_threshold()
 @ cdecl _get_terminate() MSVCRT__get_terminate
 @ cdecl _get_timezone(ptr)
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index b76a353f52..4f67f1468e 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -533,7 +533,7 @@
 @ cdecl _get_output_format() MSVCRT__get_output_format
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
-@ stub _get_purecall_handler
+@ cdecl _get_purecall_handler()
 @ cdecl _get_sbh_threshold()
 @ cdecl _get_terminate() MSVCRT__get_terminate
 @ cdecl _get_timezone(ptr)
diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c
index 1d190817df..44b29c133c 100644
--- a/dlls/msvcrt/exit.c
+++ b/dlls/msvcrt/exit.c
@@ -474,6 +474,15 @@ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler func
     return ret;
 }
 
+/*********************************************************************
+ *		_get_purecall_handler
+ */
+MSVCRT_purecall_handler CDECL _get_purecall_handler(void)
+{
+    TRACE("\n");
+    return purecall_handler;
+}
+
 /*********************************************************************
  *		_purecall (MSVCRT.@)
  */
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index a2c16e4e32..7878acbda8 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -372,7 +372,7 @@
 @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
-@ stub _get_purecall_handler
+@ cdecl _get_purecall_handler()
 @ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers
 @ cdecl _get_terminate() MSVCRT__get_terminate
 @ cdecl _get_thread_local_invalid_parameter_handler()
diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec
index 7dbc8cab57..b2d11bc2b4 100644
--- a/dlls/vcruntime140/vcruntime140.spec
+++ b/dlls/vcruntime140/vcruntime140.spec
@@ -57,7 +57,7 @@
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2
 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3
 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common
-@ stub _get_purecall_handler
+@ cdecl _get_purecall_handler() ucrtbase._get_purecall_handler
 @ cdecl _get_unexpected() ucrtbase._get_unexpected
 @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2
 @ stub _is_exception_typeof
-- 
2.15.0




More information about the wine-devel mailing list