diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 4a3c7a81700..6745aeea768 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -458,22 +458,26 @@ static void test_sbheap(void) static void test_calloc(void) { + /* use function pointer to bypass gcc builtin */ + void *(__cdecl *p_calloc)(size_t, size_t); void *ptr; - ptr = calloc(1, 0); + p_calloc = (void *)GetProcAddress( GetModuleHandleA("msvcrt.dll"), "calloc"); + + ptr = p_calloc(1, 0); ok(ptr != NULL, "got %p\n", ptr); free(ptr); - ptr = calloc(0, 0); + ptr = p_calloc(0, 0); ok(ptr != NULL, "got %p\n", ptr); free(ptr); - ptr = calloc(0, 1); + ptr = p_calloc(0, 1); ok(ptr != NULL, "got %p\n", ptr); free(ptr); errno = 0; - ptr = calloc(~(size_t)0 / 2, ~(size_t)0 / 2); + ptr = p_calloc(~(size_t)0 / 2, ~(size_t)0 / 2); ok(ptr == NULL || broken(ptr != NULL) /* winxp sp0 */, "got %p\n", ptr); ok(errno == ENOMEM || broken(errno == 0) /* winxp, win2k3 */, "got errno %d\n", errno); free(ptr); diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index b7244835aca..6d38e438c8c 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -24,6 +24,9 @@ static void test_sscanf( void ) { + /* use function pointers to bypass gcc builtin */ + int (WINAPIV *p_sprintf)(char *buf, const char *fmt, ...); + int (WINAPIV *p_sscanf)(const char *buf, const char *fmt, ...); char buffer[100], buffer1[100]; char format[20]; int result, ret; @@ -35,197 +38,200 @@ static void test_sscanf( void ) static const char pname[]=" St. Petersburg, Florida\n"; int hour=21,min=59,sec=20; int number,number_so_far; + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + p_sprintf = (void *)GetProcAddress( hmod, "sprintf" ); + p_sscanf = (void *)GetProcAddress( hmod, "sscanf" ); /* check EOF */ strcpy(buffer,""); - ret = sscanf(buffer, "%d", &result); + ret = p_sscanf(buffer, "%d", &result); ok( ret == EOF,"sscanf returns %x instead of %x\n", ret, EOF ); /* check %p */ - ok( sscanf("000000000046F170", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( p_sscanf("000000000046F170", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x46F170,"sscanf reads %p instead of %x\n", ptr, 0x46F170 ); - ok( sscanf("0046F171", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( p_sscanf("0046F171", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x46F171,"sscanf reads %p instead of %x\n", ptr, 0x46F171 ); - ok( sscanf("46F172", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( p_sscanf("46F172", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x46F172,"sscanf reads %p instead of %x\n", ptr, 0x46F172 ); - ok( sscanf("0x46F173", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( p_sscanf("0x46F173", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == NULL,"sscanf reads %p instead of %x\n", ptr, 0 ); - ok( sscanf("-46F174", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( p_sscanf("-46F174", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)(ULONG_PTR)-0x46f174,"sscanf reads %p instead of %p\n", ptr, (void *)(ULONG_PTR)-0x46f174 ); - ok( sscanf("+46F175", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( p_sscanf("+46F175", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x46F175,"sscanf reads %p instead of %x\n", ptr, 0x46F175 ); /* check %p with no hex digits */ - ok( sscanf("1233", "%p", &ptr) == 1, "sscanf failed\n" ); + ok( p_sscanf("1233", "%p", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x1233,"sscanf reads %p instead of %x\n", ptr, 0x1233 ); - ok( sscanf("1234", "%P", &ptr) == 1, "sscanf failed\n" ); + ok( p_sscanf("1234", "%P", &ptr) == 1, "sscanf failed\n" ); ok( ptr == (void *)0x1234,"sscanf reads %p instead of %x\n", ptr, 0x1234 ); /* check %x */ strcpy(buffer,"0x519"); - ok( sscanf(buffer, "%x", &result) == 1, "sscanf failed\n" ); + ok( p_sscanf(buffer, "%x", &result) == 1, "sscanf failed\n" ); ok( result == 0x519,"sscanf reads %x instead of %x\n", result, 0x519 ); strcpy(buffer,"0x51a"); - ok( sscanf(buffer, "%x", &result) == 1, "sscanf failed\n" ); + ok( p_sscanf(buffer, "%x", &result) == 1, "sscanf failed\n" ); ok( result == 0x51a ,"sscanf reads %x instead of %x\n", result, 0x51a ); strcpy(buffer,"0x51g"); - ok( sscanf(buffer, "%x", &result) == 1, "sscanf failed\n" ); + ok( p_sscanf(buffer, "%x", &result) == 1, "sscanf failed\n" ); ok( result == 0x51, "sscanf reads %x instead of %x\n", result, 0x51 ); result = 0; - ret = sscanf("-1", "%x", &result); + ret = p_sscanf("-1", "%x", &result); ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); ok(result == -1, "Read %d, expected -1\n", result); /* check % followed by any char */ strcpy(buffer,"\"%12@"); strcpy(format,"%\"%%%d%@"); /* work around gcc format check */ - ok( sscanf(buffer, format, &result) == 1, "sscanf failed\n" ); + ok( p_sscanf(buffer, format, &result) == 1, "sscanf failed\n" ); ok( result == 12, "sscanf reads %x instead of %x\n", result, 12 ); /* Check float */ - ret = sprintf(buffer,"%f %f",res1, res2); + ret = p_sprintf(buffer,"%f %f",res1, res2); ok( ret == 20, "expected 20, got %u\n", ret); - ret = sscanf(buffer,"%f%f",&res11, &res12); + ret = p_sscanf(buffer,"%f%f",&res11, &res12); ok( ret == 2, "expected 2, got %u\n", ret); ok( (res11 == res1) && (res12 == res2), "Error reading floats\n"); /* Check double */ - ret = sprintf(buffer, "%lf", 32.715); + ret = p_sprintf(buffer, "%lf", 32.715); ok(ret == 9, "expected 9, got %u\n", ret); - ret = sscanf(buffer, "%lf", &double_res); + ret = p_sscanf(buffer, "%lf", &double_res); ok(ret == 1, "expected 1, got %u\n", ret); ok(double_res == 32.715, "Got %lf, expected %lf\n", double_res, 32.715); - ret = sscanf(buffer, "%Lf", &double_res); + ret = p_sscanf(buffer, "%Lf", &double_res); ok(ret == 1, "expected 1, got %u\n", ret); ok(double_res == 32.715, "Got %lf, expected %lf\n", double_res, 32.715); strcpy(buffer, "1.1e-30"); - ret = sscanf(buffer, "%lf", &double_res); + ret = p_sscanf(buffer, "%lf", &double_res); ok(ret == 1, "expected 1, got %u\n", ret); ok(double_res >= 1.1e-30-1e-45 && double_res <= 1.1e-30+1e-45, "Got %.18le, expected %.18le\n", double_res, 1.1e-30); /* check strings */ - ret = sprintf(buffer," %s", pname); + ret = p_sprintf(buffer," %s", pname); ok( ret == 26, "expected 26, got %u\n", ret); - ret = sscanf(buffer,"%*c%[^\n]",buffer1); + ret = p_sscanf(buffer,"%*c%[^\n]",buffer1); ok( ret == 1, "Error with format \"%s\"\n","%*c%[^\n]"); ok( strncmp(pname,buffer1,strlen(buffer1)) == 0, "Error with \"%s\" \"%s\"\n",pname, buffer1); - ret = sscanf("abcefgdh","%*[a-cg-e]%c",&buffer[0]); + ret = p_sscanf("abcefgdh","%*[a-cg-e]%c",&buffer[0]); ok( ret == 1, "Error with format \"%s\"\n","%*[a-cg-e]%c"); ok( buffer[0] == 'd', "Error with \"abcefgdh\" \"%c\"\n", buffer[0]); - ret = sscanf("abcefgdh","%*[a-cd-dg-e]%c",&buffer[0]); + ret = p_sscanf("abcefgdh","%*[a-cd-dg-e]%c",&buffer[0]); ok( ret == 1, "Error with format \"%s\"\n","%*[a-cd-dg-e]%c"); ok( buffer[0] == 'h', "Error with \"abcefgdh\" \"%c\"\n", buffer[0]); buffer1[0] = 'b'; - ret = sscanf("a","%s%s", buffer, buffer1); + ret = p_sscanf("a","%s%s", buffer, buffer1); ok( ret == 1, "expected 1, got %u\n", ret); ok( buffer[0] == 'a', "buffer[0] = '%c'\n", buffer[0]); ok( buffer[1] == '\0', "buffer[1] = '%c'\n", buffer[1]); ok( buffer1[0] == 'b', "buffer1[0] = '%c'\n", buffer1[0]); /* check digits */ - ret = sprintf(buffer,"%d:%d:%d",hour,min,sec); + ret = p_sprintf(buffer,"%d:%d:%d",hour,min,sec); ok( ret == 8, "expected 8, got %u\n", ret); - ret = sscanf(buffer,"%d%n",&number,&number_so_far); + ret = p_sscanf(buffer,"%d%n",&number,&number_so_far); ok(ret == 1 , "problem with format arg \"%%d%%n\"\n"); ok(number == hour,"Read wrong arg %d instead of %d\n",number, hour); ok(number_so_far == 2,"Read wrong arg for \"%%n\" %d instead of 2\n",number_so_far); - ret = sscanf(buffer+2,"%*c%n",&number_so_far); + ret = p_sscanf(buffer+2,"%*c%n",&number_so_far); ok(ret == 0 , "problem with format arg \"%%*c%%n\"\n"); ok(number_so_far == 1,"Read wrong arg for \"%%n\" %d instead of 2\n",number_so_far); result = 0xdeadbeef; strcpy(buffer,"12345678"); - ret = sscanf(buffer, "%hd", &result); + ret = p_sscanf(buffer, "%hd", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 0xdead614e, "Wrong number read (%x)\n", result); result = 0xdeadbeef; - ret = sscanf(buffer, "%hhd", &result); + ret = p_sscanf(buffer, "%hhd", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 0xbc614e, "Wrong number read (%x)\n", result); strcpy(buffer,"12345678901234"); - ret = sscanf(buffer, "%lld", &result64); + ret = p_sscanf(buffer, "%lld", &result64); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); - ret = sprintf(buffer1, "%lld", result64); + ret = p_sprintf(buffer1, "%lld", result64); ok(ret==14 || broken(ret==10), "sprintf returned %d\n", ret); if(ret == 14) ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); /* Check %i according to bug 1878 */ strcpy(buffer,"123"); - ret = sscanf(buffer, "%i", &result); + ret = p_sscanf(buffer, "%i", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 123, "Wrong number read\n"); result = 0; - ret = sscanf("-1", "%i", &result); + ret = p_sscanf("-1", "%i", &result); ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); ok(result == -1, "Read %d, expected -1\n", result); - ret = sscanf(buffer, "%d", &result); + ret = p_sscanf(buffer, "%d", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 123, "Wrong number read\n"); result = 0; - ret = sscanf("-1", "%d", &result); + ret = p_sscanf("-1", "%d", &result); ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); ok(result == -1, "Read %d, expected -1\n", result); /* Check %i for octal and hexadecimal input */ result = 0; strcpy(buffer,"017"); - ret = sscanf(buffer, "%i", &result); + ret = p_sscanf(buffer, "%i", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 15, "Wrong number read\n"); result = 0; strcpy(buffer,"0x17"); - ret = sscanf(buffer, "%i", &result); + ret = p_sscanf(buffer, "%i", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 23, "Wrong number read\n"); /* %o */ result = 0; - ret = sscanf("-1", "%o", &result); + ret = p_sscanf("-1", "%o", &result); ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); ok(result == -1, "Read %d, expected -1\n", result); /* %u */ result = 0; - ret = sscanf("-1", "%u", &result); + ret = p_sscanf("-1", "%u", &result); ok(ret == 1, "Wrong number of arguments read: %d (expected 1)\n", ret); ok(result == -1, "Read %d, expected -1\n", result); /* Check %c */ strcpy(buffer,"a"); c = 0x55; - ret = sscanf(buffer, "%c", &c); + ret = p_sscanf(buffer, "%c", &c); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(c == 'a', "Field incorrect: '%c'\n", c); strcpy(buffer," a"); c = 0x55; - ret = sscanf(buffer, "%c", &c); + ret = p_sscanf(buffer, "%c", &c); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(c == ' ', "Field incorrect: '%c'\n", c); strcpy(buffer,"18:59"); c = 0x55; - ret = sscanf(buffer, "%d:%d%c", &hour, &min, &c); + ret = p_sscanf(buffer, "%d:%d%c", &hour, &min, &c); ok(ret == 2, "Wrong number of arguments read: %d\n", ret); ok(hour == 18, "Field 1 incorrect: %d\n", hour); ok(min == 59, "Field 2 incorrect: %d\n", min); @@ -233,7 +239,7 @@ static void test_sscanf( void ) /* Check %n (also whitespace in format strings and %s) */ buffer[0]=0; buffer1[0]=0; - ret = sscanf("abc def", "%s %n%s", buffer, &number_so_far, buffer1); + ret = p_sscanf("abc def", "%s %n%s", buffer, &number_so_far, buffer1); ok(strcmp(buffer, "abc")==0, "First %%s read incorrectly: %s\n", buffer); ok(strcmp(buffer1,"def")==0, "Second %%s read incorrectly: %s\n", buffer1); ok(number_so_far==6, "%%n yielded wrong result: %d\n", number_so_far); @@ -241,18 +247,18 @@ static void test_sscanf( void ) /* Check where %n matches to EOF in buffer */ strcpy(buffer, "3:45"); - ret = sscanf(buffer, "%d:%d%n", &hour, &min, &number_so_far); + ret = p_sscanf(buffer, "%d:%d%n", &hour, &min, &number_so_far); ok(ret == 2, "Wrong number of arguments read: %d\n", ret); ok(number_so_far == 4, "%%n yielded wrong result: %d\n", number_so_far); buffer[0] = 0; buffer1[0] = 0; - ret = sscanf("test=value\xda", "%[^=] = %[^;]", buffer, buffer1); + ret = p_sscanf("test=value\xda", "%[^=] = %[^;]", buffer, buffer1); ok(ret == 2, "got %d\n", ret); ok(!strcmp(buffer, "test"), "buf %s\n", buffer); ok(!strcmp(buffer1, "value\xda"), "buf %s\n", buffer1); - ret = sscanf("\x81\x82test", "\x81%\x82%s", buffer); + ret = p_sscanf("\x81\x82test", "\x81%\x82%s", buffer); ok(ret == 1, "got %d\n", ret); ok(!strcmp(buffer, "test"), "buf = %s\n", buffer); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index cbfa53a3731..0f1ee47d173 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3098,29 +3098,33 @@ static void test_atof(void) static void test_strncpy(void) { #define TEST_STRNCPY_LEN 10 + /* use function pointer to bypass gcc builtin */ + char *(__cdecl *p_strncpy)(char*,const char*,size_t); char *ret; char dst[TEST_STRNCPY_LEN + 1]; char not_null_terminated[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'}; + p_strncpy = (void *)GetProcAddress( GetModuleHandleA("msvcrt.dll"), "strncpy"); + /* strlen(src) > TEST_STRNCPY_LEN */ - ret = strncpy(dst, "01234567890123456789", TEST_STRNCPY_LEN); + ret = p_strncpy(dst, "01234567890123456789", TEST_STRNCPY_LEN); ok(ret == dst, "ret != dst\n"); ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); /* without null-terminated */ - ret = strncpy(dst, not_null_terminated, TEST_STRNCPY_LEN); + ret = p_strncpy(dst, not_null_terminated, TEST_STRNCPY_LEN); ok(ret == dst, "ret != dst\n"); ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); /* strlen(src) < TEST_STRNCPY_LEN */ strcpy(dst, "0123456789"); - ret = strncpy(dst, "012345", TEST_STRNCPY_LEN); + ret = p_strncpy(dst, "012345", TEST_STRNCPY_LEN); ok(ret == dst, "ret != dst\n"); ok(!strcmp(dst, "012345"), "dst != 012345\n"); ok(dst[TEST_STRNCPY_LEN - 1] == '\0', "dst[TEST_STRNCPY_LEN - 1] != 0\n"); /* strlen(src) == TEST_STRNCPY_LEN */ - ret = strncpy(dst, "0123456789", TEST_STRNCPY_LEN); + ret = p_strncpy(dst, "0123456789", TEST_STRNCPY_LEN); ok(ret == dst, "ret != dst\n"); ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); }