ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Fix _get/_set_invalid_parameter_handler implementation.

This commit is contained in:
Piotr Caban 2010-04-01 12:40:22 +02:00 committed by Alexandre Julliard
parent f377e4be6b
commit abb746002b
5 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/msvcr80/msvcr80.spec
View File

@ -470,7 +470,7 @@
@ stub _get_errno
@ stub _get_fmode
@ stub _get_heap_handle
@ cdecl _get_invalid_parameter_handler() msvcr90._get_invalid_parameter_handler
@ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler
@ cdecl _get_osfhandle(long) msvcrt._get_osfhandle
@ stub _get_osplatform
@ stub _get_osver
@ -533,7 +533,7 @@
@ stub _inp
@ stub _inpd
@ stub _inpw
@ extern _invalid_parameter msvcrt._invalid_parameter
@ stub _invalid_parameter
@ stub _invalid_parameter_noinfo
@ stub _invoke_watson
@ extern _iob msvcrt._iob
@ -873,7 +873,7 @@
@ stub _set_errno
@ cdecl _set_error_mode(long) msvcrt._set_error_mode
@ stub _set_fmode
@ cdecl _set_invalid_parameter_handler(ptr) msvcr90._set_invalid_parameter_handler
@ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler
@ stub _set_malloc_crt_max_wait
@ stub _set_output_format
@ stub _set_printf_count_output

25
dlls/msvcr90/msvcr90.c
View File

@ -27,7 +27,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(msvcr90);
typedef int (CDECL *_INITTERM_E_FN)(void);
typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, unsigned*);
/*********************************************************************
* DllMain (MSVCR90.@)
@ -77,30 +76,6 @@ void * CDECL _encoded_null(void)
return MSVCR90_encode_pointer(NULL);
}
/*********************************************************************
* _get_invalid_parameter_handler (MSVCR90.@)
*/
_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void)
{
TRACE("\n");
return *((_invalid_parameter_handler*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_invalid_parameter"));
}
/*********************************************************************
* _set_invalid_parameter_handler (MSVCR90.@)
*/
_invalid_parameter_handler CDECL _set_invalid_parameter_handler(_invalid_parameter_handler handler)
{
_invalid_parameter_handler *ptr = (_invalid_parameter_handler*)GetProcAddress(
GetModuleHandleA("msvcrt.dll"), "_invalid_parameter");
_invalid_parameter_handler old = *ptr;
TRACE("(%p)\n", handler);
*ptr = handler;
return old;
}
/*********************************************************************
* _initterm_e (MSVCR90.@)
*

6
dlls/msvcr90/msvcr90.spec
View File

@ -462,7 +462,7 @@
@ stub _get_errno
@ stub _get_fmode
@ stub _get_heap_handle
@ cdecl _get_invalid_parameter_handler()
@ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler
@ cdecl _get_osfhandle(long) msvcrt._get_osfhandle
@ stub _get_output_format
@ stub _get_pgmptr
@ -521,7 +521,7 @@
@ stub _inp
@ stub _inpd
@ stub _inpw
@ extern _invalid_parameter msvcrt._invalid_parameter
@ stub _invalid_parameter
@ stub _invalid_parameter_noinfo
@ stub _invoke_watson
@ extern _iob msvcrt._iob
@ -859,7 +859,7 @@
@ stub _set_errno
@ cdecl _set_error_mode(long) msvcrt._set_error_mode
@ stub _set_fmode
@ cdecl _set_invalid_parameter_handler(ptr)
@ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler
@ stub _set_malloc_crt_max_wait
@ stub _set_output_format
@ stub _set_printf_count_output

19
dlls/msvcrt/errno.c
View File

@ -286,3 +286,22 @@ void CDECL _seterrormode(int mode)
{
SetErrorMode( mode );
}
/* _get_invalid_parameter_handler - not exported in native msvcrt, added in msvcr80 */
MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void)
{
TRACE("\n");
return MSVCRT_invalid_parameter;
}
/* _set_invalid_parameter_handler - not exproted in native msvcrt, added in msvcr80 */
MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler(
MSVCRT_invalid_parameter_handler handler)
{
MSVCRT_invalid_parameter_handler old = MSVCRT_invalid_parameter;
TRACE("(%p)\n", handler);
MSVCRT_invalid_parameter = handler;
return old;
}

6
dlls/msvcrt/msvcrt.spec
View File

@ -479,7 +479,7 @@
@ stub _inp #(long) -i386
@ stub _inpd #(long) -i386
@ stub _inpw #(long) -i386
@ extern _invalid_parameter MSVCRT_invalid_parameter
@ stub _invalid_parameter
@ extern _iob MSVCRT__iob
# stub _isalnum_l
# stub _isalpha_l
@ -1409,3 +1409,7 @@
# stub wprintf_s
@ varargs wscanf(wstr) MSVCRT_wscanf
# stub wscanf_s
# Functions not exported in native dll:
@ cdecl _get_invalid_parameter_handler()
@ cdecl _set_invalid_parameter_handler(ptr)