Module: wine Branch: master Commit: e76ea27ef681cd88996fa7b760875f1197f0d7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76ea27ef681cd88996fa7b760...
Author: Piotr Caban piotr@codeweavers.com Date: Thu May 4 14:36:33 2017 +0200
msvcr100: Add _invalid_parameter_noinfo_noreturn implementation.
Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
.../api-ms-win-crt-runtime-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/msvcrt/errno.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 57c5ecf..e9382cd 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -57,7 +57,7 @@ @ cdecl _initterm(ptr ptr) ucrtbase._initterm @ cdecl _initterm_e(ptr ptr) ucrtbase._initterm_e @ cdecl _invalid_parameter_noinfo() ucrtbase._invalid_parameter_noinfo -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() ucrtbase._invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ stub _query_app_type @ cdecl _register_onexit_function(ptr ptr) ucrtbase._register_onexit_function diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 99bffe0..2f5bc4b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -939,7 +939,7 @@ @ stub -arch=i386 _inpw(long) @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ extern _iob MSVCRT__iob @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cb7a043..7bd7f75 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1285,7 +1285,7 @@ @ stub -arch=i386 _inpw(long) @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ extern _iob MSVCRT__iob @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c2477e2..0c7e84d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1285,7 +1285,7 @@ @ stub -arch=i386 _inpw(long) @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ extern _iob MSVCRT__iob @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 443eac8..520ef22 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1188,7 +1188,7 @@ @ cdecl _initterm_e(ptr ptr) msvcr120._initterm_e @ cdecl _invalid_parameter(wstr wstr wstr long long) msvcr120._invalid_parameter @ cdecl _invalid_parameter_noinfo() msvcr120._invalid_parameter_noinfo -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() msvcr120._invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ extern _iob msvcr120._iob @ cdecl _isalnum_l(long ptr) msvcr120._isalnum_l diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 893ed7b..45bc194 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -487,6 +487,15 @@ void CDECL _invalid_parameter_noinfo(void) }
/********************************************************************* + * _invalid_parameter_noinfo_noreturn (MSVCR100.@) + */ +void CDECL _invalid_parameter_noinfo_noreturn(void) +{ + MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + MSVCRT__exit( STATUS_INVALID_CRUNTIME_PARAMETER ); +} + +/********************************************************************* * _get_invalid_parameter_handler (MSVCR80.@) */ MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index dbc418c..78ae7d6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -424,7 +424,7 @@ @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @ cdecl _invalid_parameter_noinfo() -@ stub _invalid_parameter_noinfo_noreturn +@ cdecl _invalid_parameter_noinfo_noreturn() @ stub _invoke_watson @ stub _is_exception_typeof @ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l
-
Alexandre Julliard