Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRT] Sync $I10_OUTPUT and test with wine head

Browse source 
Both were broken on MSVC builds, where a long double is 64 bits and not 80 bits like on GCC. The new code works on MSVC builds, too.
This commit is contained in:
Timo Kreuzer 2023-12-20 12:06:05 +02:00
parent 40131fd1ca
commit 86b82e4ce7
5 changed files with 206 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

92
modules/rostests/winetests/msvcrt/misc.c
View file

@ -51,8 +51,11 @@ static inline BOOL almost_equal(double d1, double d2) {
return FALSE;
}
/* MS' "long double" is an 80 bit FP that takes 12 bytes*/
struct uld { ULONG lo, hi, exp; };
static int (__cdecl *prand_s)(unsigned int *);
static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*);
static int (__cdecl *pI10_OUTPUT)(struct uld, int, int, void*);
static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int);
static int (__cdecl *p_get_doserrno)(int *);
static int (__cdecl *p_get_errno)(int *);
@ -115,7 +118,7 @@ typedef struct _I10_OUTPUT_data {
} I10_OUTPUT_data;
typedef struct _I10_OUTPUT_test {
long double d;
struct uld d;
int size;
int flags;
@ -126,63 +129,62 @@ typedef struct _I10_OUTPUT_test {
static const I10_OUTPUT_test I10_OUTPUT_tests[] = {
/* arg3 = 0 */
{ 0.0, 10, 0, {0, ' ', 1, "0"}, 1, "" },
{ 1.0, 10, 0, {1, ' ', 1, "1"}, 1, "000000009" },
{ -1.0, 10, 0, {1, '-', 1, "1"}, 1, "000000009" },
{ 1.23, 10, 0, {1, ' ', 3, "123"}, 1, "0000009" },
{ 1e13, 10, 0, {14, ' ', 1, "1"}, 1, "000000009" },
{ 1e30, 30, 0, {31, ' ', 21, "100000000000000001988"}, 1, "" },
{ 1e-13, 10, 0, {-12, ' ', 1, "1"}, 1, "000000000" },
{ 0.25, 10, 0, {0, ' ', 2, "25"}, 1, "00000000" },
{ 1.0000001, 10, 0, {1, ' ', 8, "10000001"}, 1, "00" },
{ { 0x00000000, 0x00000000, 0x0000 /* 0.0 */ }, 10, 0, {0, ' ', 1, "0"}, 1, "" },
{ { 0x00000000, 0x80000000, 0x3fff /* 1.0 */ }, 10, 0, {1, ' ', 1, "1"}, 1, "000000009" },
{ { 0x00000000, 0x80000000, 0xbfff /* -1.0 */ }, 10, 0, {1, '-', 1, "1"}, 1, "000000009" },
{ { 0x0a3d7000, 0x9d70a3d7, 0x3fff /* 1.23 */ }, 10, 0, {1, ' ', 3, "123"}, 1, "0000009" },
{ { 0x00000000, 0x9184e72a, 0x402a /* 1e13 */ }, 10, 0, {14, ' ', 1, "1"}, 1, "000000009" },
{ { 0x04675000, 0xc9f2c9cd, 0x4062 /* 1e30 */ }, 30, 0, {31, ' ', 21, "100000000000000001988"}, 1, "" },
{ { 0x4bb41000, 0xe12e1342, 0x3fd3 /* 1e-13 */ }, 10, 0, {-12, ' ', 1, "1"}, 1, "000000000" },
{ { 0x00000000, 0x80000000, 0x3ffd /* 0.25 */ }, 10, 0, {0, ' ', 2, "25"}, 1, "00000000" },
{ { 0xbf94d800, 0x800000d6, 0x3fff /* 1.0000001 */ }, 10, 0, {1, ' ', 8, "10000001"}, 1, "00" },
{ { 0x00000000, 0x80000000, 0x7fff /* +inf */ }, 10, 0, {1, ' ', 5, "1#INF"}, 0, "" },
{ { 0x00000000, 0x80000000, 0xffff /* -inf */ }, 10, 0, {1, '-', 5, "1#INF"}, 0, "" },
{ { 0x00000001, 0x80000000, 0x7fff /* snan */ }, 10, 0, {1, ' ', 6, "1#SNAN"}, 0, "" },
{ { 0x00000001, 0x80000000, 0xffff /* snan */ }, 10, 0, {1, '-', 6, "1#SNAN"}, 0, "" },
{ { 0x00000000, 0xc0000000, 0x7fff /* qnan */ }, 10, 0, {1, ' ', 6, "1#QNAN"}, 0, "" },
{ { 0x00000000, 0x40000000, 0xffff /* qnan */ }, 10, 0, {1, '-', 6, "1#QNAN"}, 0, "" },
/* arg3 = 1 */
{ 0.0, 10, 1, {0, ' ', 1, "0"}, 1, "" },
{ 1.0, 10, 1, {1, ' ', 1, "1"}, 1, "0000000009" },
{ -1.0, 10, 1, {1, '-', 1, "1"}, 1, "0000000009" },
{ 1.23, 10, 1, {1, ' ', 3, "123"}, 1, "00000009" },
{ 1e13, 10, 1, {14, ' ', 1, "1"}, 1, "00000000000000000009" },
{ 1e30, 30, 1, {31, ' ', 21, "100000000000000001988"}, 1, "" },
{ 1e-13, 10, 1, {0, ' ', 1, "0"}, 1, "" },
{ 1e-7, 10, 1, {-6, ' ', 1, "1"}, 1, "09" },
{ 0.25, 10, 1, {0, ' ', 2, "25"}, 1, "00000000" },
{ 1.0000001, 10, 1, {1, ' ', 8, "10000001"}, 1, "000" },
{ { 0x00000000, 0x00000000, 0x0000 /* 0 */ }, 10, 1, {0, ' ', 1, "0"}, 1, "" },
{ { 0x00000000, 0x80000000, 0x3fff /* 1 */ }, 10, 1, {1, ' ', 1, "1"}, 1, "0000000009" },
{ { 0x00000000, 0x80000000, 0xbfff /* -1 */ }, 10, 1, {1, '-', 1, "1"}, 1, "0000000009" },
{ { 0x0a3d7000, 0x9d70a3d7, 0x3fff /* 1.23 */ }, 10, 1, {1, ' ', 3, "123"}, 1, "00000009" },
{ { 0x00000000, 0x9184e72a, 0x402a /* 1e13 */ }, 10, 1, {14, ' ', 1, "1"}, 1, "00000000000000000009" },
{ { 0x04675000, 0xc9f2c9cd, 0x4062 /* 1e30 */ }, 30, 1, {31, ' ', 21, "100000000000000001988"}, 1, "" },
{ { 0x4bb41000, 0xe12e1342, 0x3fd3 /* 1e-13 */ }, 10, 1, {0, ' ', 1, "0"}, 1, "" },
{ { 0xe57a4000, 0xd6bf94d5, 0x3fe7 /* 1e-7 */ }, 10, 1, {-6, ' ', 1, "1"}, 1, "09" },
{ { 0x00000000, 0x80000000, 0x3ffd /* 0.25 */ }, 10, 1, {0, ' ', 2, "25"}, 1, "00000000" },
{ { 0xbf94d800, 0x800000d6, 0x3fff /* 1.0000001 */ }, 10, 1, {1, ' ', 8, "10000001"}, 1, "000" },
{ { 0x00000000, 0x80000000, 0x7fff /* +inf */ }, 10, 1, {1, ' ', 5, "1#INF"}, 0, "" },
{ { 0x00000000, 0x80000000, 0xffff /* -inf */ }, 10, 1, {1, '-', 5, "1#INF"}, 0, "" },
{ { 0x00000001, 0x80000000, 0x7fff /* snan */ }, 10, 1, {1, ' ', 6, "1#SNAN"}, 0, "" },
{ { 0x00000000, 0xc0000000, 0x7fff /* qnan */ }, 10, 1, {1, ' ', 6, "1#QNAN"}, 0, "" },
{ { 0x00000000, 0x40000000, 0x7fff /* qnan */ }, 10, 1, {1, ' ', 6, "1#QNAN"}, 0, "" },
/* too small buffer */
{ 0.0, 0, 0, {0, ' ', 1, "0"}, 1, "" },
{ 0.0, 0, 1, {0, ' ', 1, "0"}, 1, "" },
{ 123.0, 2, 0, {3, ' ', 2, "12"}, 1, "" },
{ 123.0, 0, 0, {0, ' ', 1, "0"}, 1, "" },
{ 123.0, 2, 1, {3, ' ', 3, "123"}, 1, "09" },
{ 0.99, 1, 0, {1, ' ', 1, "1"}, 1, "" },
{ 1264567.0, 2, 0, {7, ' ', 2, "13"}, 1, "" },
{ 1264567.0, 2, 1, {7, ' ', 7, "1264567"}, 1, "00" },
{ 1234567891.0, 2, 1, {10, ' ', 10, "1234567891"}, 1, "09" }
{ { 0x00000000, 0x00000000, 0x0000 /* 0 */ }, 0, 0, {0, ' ', 1, "0"}, 1, "" },
{ { 0x00000000, 0x00000000, 0x0000 /* 0 */ }, 0, 1, {0, ' ', 1, "0"}, 1, "" },
{ { 0x00000000, 0xf6000000, 0x4005 /* 123 */ }, 2, 0, {3, ' ', 2, "12"}, 1, "" },
{ { 0x00000000, 0xf6000000, 0x4005 /* 123 */ }, 0, 0, {0, ' ', 1, "0"}, 1, "" },
{ { 0x00000000, 0xf6000000, 0x4005 /* 123 */ }, 2, 1, {3, ' ', 3, "123"}, 1, "09" },
{ { 0x0a3d7000, 0xfd70a3d7, 0x3ffe /* 0.99 */ }, 1, 0, {1, ' ', 1, "1"}, 1, "" },
{ { 0x00000000, 0x9a5db800, 0x4013 /* 1264567.0 */ }, 2, 0, {7, ' ', 2, "13"}, 1, "" },
{ { 0x00000000, 0x9a5db800, 0x4013 /* 1264567.0 */ }, 2, 1, {7, ' ', 7, "1264567"}, 1, "00" },
{ { 0x00000000, 0x932c05a6, 0x401d /* 1234567891.0 */ }, 2, 1, {10, ' ', 10, "1234567891"}, 1, "09" }
};
static void test_I10_OUTPUT(void)
{
I10_OUTPUT_data out;
int i, j = sizeof(long double), ret;
int i, j, ret;
if(!pI10_OUTPUT) {
win_skip("I10_OUTPUT not available\n");
return;
}
if (j != 12)
trace("sizeof(long double) = %d on this machine\n", j);
for(i=0; i<ARRAY_SIZE(I10_OUTPUT_tests); i++) {
memset(out.str, '#', sizeof(out.str));
if (sizeof(long double) == 12)
ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out);
else {
/* MS' "long double" is an 80 bit FP that takes 12 bytes*/
typedef struct { ULONG x80[3]; } uld; /* same calling convention */
union { long double ld; uld ld12; } fp80;
int (__cdecl *pI10_OUTPUT12)(uld, int, int, void*) = (void*)pI10_OUTPUT;
fp80.ld = I10_OUTPUT_tests[i].d;
ret = pI10_OUTPUT12(fp80.ld12, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out);
}
ret = pI10_OUTPUT(I10_OUTPUT_tests[i].d, I10_OUTPUT_tests[i].size, I10_OUTPUT_tests[i].flags, &out);
ok(ret == I10_OUTPUT_tests[i].ret, "%d: ret = %d\n", i, ret);
ok(out.pos == I10_OUTPUT_tests[i].out.pos, "%d: out.pos = %hd\n", i, out.pos);
ok(out.sign == I10_OUTPUT_tests[i].out.sign, "%d: out.size = %c\n", i, out.sign);
@ -192,7 +194,7 @@ static void test_I10_OUTPUT(void)
j = strlen(I10_OUTPUT_tests[i].remain);
todo_wine_if(j && I10_OUTPUT_tests[i].remain[j-1]=='9')
ok(!strncmp(out.str+out.len+1, I10_OUTPUT_tests[i].remain, j),
"%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1);
"%d: &out.str[%d] = %.25s...\n", i, out.len+1, out.str+out.len+1);
for(j=out.len+strlen(I10_OUTPUT_tests[i].remain)+1; j<sizeof(out.str); j++)
if(out.str[j] != '#')