Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-02 07:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync msvcrt winetest to wine 1.1.22

Browse source 
svn path=/trunk/; revision=41110
This commit is contained in:
Christoph von Wittich 2009-05-25 09:16:39 +00:00
parent 0b310198a9
commit a6c340a5ad
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rostests/winetests/msvcrt/data.c
View file

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

8
rostests/winetests/msvcrt/heap.c
View file

@ -103,7 +103,7 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne
mem1 = malloc(size1); mem1 = malloc(size1);
if (mem1) if (mem1)
{ {
int i; unsigned int i;
for (i = 0; i < size1; i++) for (i = 0; i < size1; i++)
((char *)mem)[i] = i + 1; ((char *)mem)[i] = i + 1;
memcpy(mem1, mem, size1); 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); 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) if (memcmp(mem2, mem1, min(size1, size2)) && winetest_debug > 1)
{ {
int i; unsigned int i;
for (i = 0; i < min(size1, size2); i++) for (i = 0; i < min(size1, size2); i++)
{ {
if (((char *)mem2)[i] != ((char *)mem1)[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); mem1 = malloc(size1);
if (mem1) if (mem1)
{ {
int i; unsigned int i;
for (i = 0; i < size1; i++) for (i = 0; i < size1; i++)
((char *)mem)[i] = i + 1; ((char *)mem)[i] = i + 1;
memcpy(mem1, mem, size1); 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); 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) if (memcmp(mem2, mem1, min(size1, size2)) && winetest_debug > 1)
{ {
int i; unsigned int i;
for (i = 0; i < min(size1, size2); i++) for (i = 0; i < min(size1, size2); i++)
{ {
if (((char *)mem2)[i] != ((char *)mem1)[i]) if (((char *)mem2)[i] != ((char *)mem1)[i])