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

msvcrt: Don't raise exception in _invalid_parameter.

This commit is contained in:
Piotr Caban 2014-04-21 13:08:00 +02:00 committed by Alexandre Julliard
parent 1ca38f1dd7
commit 0cb5067698
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/errno.c
View File

@ -437,7 +437,9 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_
else else
{ {
ERR( "%s:%u %s: %s %lx\n", debugstr_w(file), line, debugstr_w(func), debugstr_w(expr), arg ); ERR( "%s:%u %s: %s %lx\n", debugstr_w(file), line, debugstr_w(func), debugstr_w(expr), arg );
#if _MSVCR_VER > 0
RaiseException( STATUS_INVALID_CRUNTIME_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, NULL ); RaiseException( STATUS_INVALID_CRUNTIME_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, NULL );
#endif
} }
} }

14
dlls/msvcrt/tests/misc.c
View File

@ -30,6 +30,8 @@ static int (__cdecl *p_get_doserrno)(int *);
static int (__cdecl *p_get_errno)(int *); static int (__cdecl *p_get_errno)(int *);
static int (__cdecl *p_set_doserrno)(int); static int (__cdecl *p_set_doserrno)(int);
static int (__cdecl *p_set_errno)(int); static int (__cdecl *p_set_errno)(int);
static void (__cdecl *p__invalid_parameter)(const wchar_t*,
const wchar_t*, const wchar_t*, unsigned int, uintptr_t);
static void init(void) static void init(void)
{ {
@ -42,6 +44,7 @@ static void init(void)
p_get_errno = (void *)GetProcAddress(hmod, "_get_errno"); p_get_errno = (void *)GetProcAddress(hmod, "_get_errno");
p_set_doserrno = (void *)GetProcAddress(hmod, "_set_doserrno"); p_set_doserrno = (void *)GetProcAddress(hmod, "_set_doserrno");
p_set_errno = (void *)GetProcAddress(hmod, "_set_errno"); p_set_errno = (void *)GetProcAddress(hmod, "_set_errno");
p__invalid_parameter = (void *)GetProcAddress(hmod, "_invalid_parameter");
} }
static void test_rand_s(void) static void test_rand_s(void)
@ -341,6 +344,16 @@ static void test__popen(const char *name)
ok(errno == EBADF, "errno = %d\n", errno); ok(errno == EBADF, "errno = %d\n", errno);
} }
static void test__invalid_parameter(void)
{
if(!p__invalid_parameter) {
win_skip("_invalid_parameter not available\n");
return;
}
p__invalid_parameter(NULL, NULL, NULL, 0, 0);
}
START_TEST(misc) START_TEST(misc)
{ {
int arg_c; int arg_c;
@ -366,4 +379,5 @@ START_TEST(misc)
test__set_doserrno(); test__set_doserrno();
test__set_errno(); test__set_errno();
test__popen(arg_v[0]); test__popen(arg_v[0]);
test__invalid_parameter();
} }