From: Piotr Caban piotr@codeweavers.com
--- dlls/msvcr70/Makefile.in | 5 ++++ dlls/msvcr70/tests/Makefile.in | 2 ++ dlls/msvcr70/tests/msvcr70.c | 51 +++++++++------------------------- 3 files changed, 20 insertions(+), 38 deletions(-)
diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index 7979542caa2..9413738ae1f 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -8,6 +8,11 @@ PARENTSRC = ../msvcrt SOURCES = \ console.c \ cpp.c \ + crt_gccmain.c \ + crt_main.c \ + crt_winmain.c \ + crt_wmain.c \ + crt_wwinmain.c \ ctype.c \ data.c \ dir.c \ diff --git a/dlls/msvcr70/tests/Makefile.in b/dlls/msvcr70/tests/Makefile.in index 29af98bb54f..2e5a78c0571 100644 --- a/dlls/msvcr70/tests/Makefile.in +++ b/dlls/msvcr70/tests/Makefile.in @@ -1,4 +1,6 @@ TESTDLL = msvcr70.dll +IMPORTS = msvcr70 +EXTRADEFS = -fno-builtin
SOURCES = \ msvcr70.c diff --git a/dlls/msvcr70/tests/msvcr70.c b/dlls/msvcr70/tests/msvcr70.c index 0b6f395ba32..3bd3f61c35f 100644 --- a/dlls/msvcr70/tests/msvcr70.c +++ b/dlls/msvcr70/tests/msvcr70.c @@ -25,63 +25,38 @@ #include <errno.h> #include "wine/test.h"
-static int (__cdecl *p_strcmp)(const char *, const char *); -static int (__cdecl *p_strncmp)(const char *, const char *, size_t); - -#define SETNOFAIL(x,y) x = (void*)GetProcAddress(hcrt,y) -#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) -static BOOL init(void) -{ - HMODULE hcrt; - - SetLastError(0xdeadbeef); - hcrt = LoadLibraryA("msvcr70.dll"); - if (!hcrt) { - win_skip("msvcr70.dll not installed (got %ld)\n", GetLastError()); - return FALSE; - } - - SET(p_strcmp, "strcmp"); - SET(p_strncmp, "strncmp"); - - return TRUE; -} - static void test_strcmp(void) { - int ret = p_strcmp( "abc", "abcd" ); + int ret = strcmp( "abc", "abcd" ); ok( ret == -1, "wrong ret %d\n", ret ); - ret = p_strcmp( "", "abc" ); + ret = strcmp( "", "abc" ); ok( ret == -1, "wrong ret %d\n", ret ); - ret = p_strcmp( "abc", "ab\xa0" ); + ret = strcmp( "abc", "ab\xa0" ); ok( ret == -1, "wrong ret %d\n", ret ); - ret = p_strcmp( "ab\xb0", "ab\xa0" ); + ret = strcmp( "ab\xb0", "ab\xa0" ); ok( ret == 1, "wrong ret %d\n", ret ); - ret = p_strcmp( "ab\xc2", "ab\xc2" ); + ret = strcmp( "ab\xc2", "ab\xc2" ); ok( ret == 0, "wrong ret %d\n", ret );
- ret = p_strncmp( "abc", "abcd", 3 ); + ret = strncmp( "abc", "abcd", 3 ); ok( ret == 0, "wrong ret %d\n", ret ); - ret = p_strncmp( "", "abc", 3 ); + ret = strncmp( "", "abc", 3 ); ok( ret == -1, "wrong ret %d\n", ret ); - ret = p_strncmp( "abc", "ab\xa0", 4 ); + ret = strncmp( "abc", "ab\xa0", 4 ); ok( ret == -1, "wrong ret %d\n", ret ); - ret = p_strncmp( "ab\xb0", "ab\xa0", 3 ); + ret = strncmp( "ab\xb0", "ab\xa0", 3 ); ok( ret == 1, "wrong ret %d\n", ret ); - ret = p_strncmp( "ab\xb0", "ab\xa0", 2 ); + ret = strncmp( "ab\xb0", "ab\xa0", 2 ); ok( ret == 0, "wrong ret %d\n", ret ); - ret = p_strncmp( "ab\xc2", "ab\xc2", 3 ); + ret = strncmp( "ab\xc2", "ab\xc2", 3 ); ok( ret == 0, "wrong ret %d\n", ret ); - ret = p_strncmp( "abc", "abd", 0 ); + ret = strncmp( "abc", "abd", 0 ); ok( ret == 0, "wrong ret %d\n", ret ); - ret = p_strncmp( "abc", "abc", 12 ); + ret = strncmp( "abc", "abc", 12 ); ok( ret == 0, "wrong ret %d\n", ret ); }
START_TEST(msvcr70) { - if(!init()) - return; - test_strcmp(); }