sync msvcrt winetest to wine 1.1.22

svn path=/trunk/; revision=41110

diff --git a/rostests/winetests/msvcrt/data.c b/rostests/winetests/msvcrt/data.c
index 40ff46b..01704ac 100644 (file)
--- a/rostests/winetests/msvcrt/data.c
+++ b/rostests/winetests/msvcrt/data.c
@@ -70,19 +70,19 @@ static void test_initterm(void)
 static void test_initvar( HMODULE hmsvcrt )
 {
     OSVERSIONINFO osvi = { sizeof(OSVERSIONINFO) };
-    int* (*pp_winver)() =  (int*(*)())GetProcAddress(hmsvcrt, "__p__winver");
-    int* (*pp_winmajor)() =  (int*(*)())GetProcAddress(hmsvcrt, "__p__winmajor");
-    int* (*pp_winminor)() =  (int*(*)())GetProcAddress(hmsvcrt, "__p__winminor");
-    int* (*pp_osver)() =  (int*(*)())GetProcAddress(hmsvcrt, "__p__osver");
-    int winver, winmajor, winminor, osver;
+    int *pp_winver   = (int*)GetProcAddress(hmsvcrt, "_winver");
+    int *pp_winmajor = (int*)GetProcAddress(hmsvcrt, "_winmajor");
+    int *pp_winminor = (int*)GetProcAddress(hmsvcrt, "_winminor");
+    int *pp_osver    = (int*)GetProcAddress(hmsvcrt, "_osver");
+    unsigned int winver, winmajor, winminor, osver;
 
     if( !( pp_winmajor && pp_winminor && pp_winver)) {
         win_skip("_winver variables are not available\n");
         return;
     }
-    winver = *pp_winver();
-    winminor = *pp_winminor();
-    winmajor = *pp_winmajor();
+    winver = *pp_winver;
+    winminor = *pp_winminor;
+    winmajor = *pp_winmajor;
     GetVersionEx( &osvi);
     ok( winminor == osvi.dwMinorVersion, "Wrong value for _winminor %02x expected %02x\n",
             winminor, osvi.dwMinorVersion);
@@ -95,7 +95,7 @@ static void test_initvar( HMODULE hmsvcrt )
         win_skip("_osver variables are not available\n");
         return;
     }
-    osver = *pp_osver();
+    osver = *pp_osver;
     ok( osver == (osvi.dwBuildNumber & 0xffff) ||
             ((osvi.dwBuildNumber >> 24) == osvi.dwMajorVersion &&
                  ((osvi.dwBuildNumber >> 16) & 0xff) == osvi.dwMinorVersion), /* 95/98/ME */

diff --git a/rostests/winetests/msvcrt/heap.c b/rostests/winetests/msvcrt/heap.c
index 6e6b544..7d3db23 100644 (file)
--- a/rostests/winetests/msvcrt/heap.c
+++ b/rostests/winetests/msvcrt/heap.c
@@ -103,7 +103,7 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne
        mem1 = malloc(size1);
         if (mem1)
         {
-            int i;
+            unsigned int i;
             for (i = 0; i < size1; i++)
                 ((char *)mem)[i] = i + 1;
             memcpy(mem1, mem, size1);
@@ -138,7 +138,7 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne
                 ok(memcmp(mem2, mem1, min(size1, size2))==0, "_aligned_realloc(%p, %d, %d) has different data\n", mem, size2, alignment);
                 if (memcmp(mem2, mem1, min(size1, size2)) && winetest_debug > 1)
                 {
-                    int i;
+                    unsigned int i;
                     for (i = 0; i < min(size1, size2); i++)
                     {
                         if (((char *)mem2)[i] != ((char *)mem1)[i])
@@ -175,7 +175,7 @@ static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2,
        mem1 = malloc(size1);
         if (mem1)
         {
-            int i;
+            unsigned int i;
             for (i = 0; i < size1; i++)
                 ((char *)mem)[i] = i + 1;
             memcpy(mem1, mem, size1);
@@ -211,7 +211,7 @@ static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2,
                 ok(memcmp(mem2, mem1, min(size1, size2))==0, "_aligned_offset_realloc(%p, %d, %d, %d) has different data\n", mem, size2, alignment, offset);
                 if (memcmp(mem2, mem1, min(size1, size2)) && winetest_debug > 1)
                 {
-                    int i;
+                    unsigned int i;
                     for (i = 0; i < min(size1, size2); i++)
                     {
                         if (((char *)mem2)[i] != ((char *)mem1)[i])