[tfaber] 54004: [GDI32_WINETEST][KERNEL32_WINETEST] - Fix MSVC build. Sent and applied upstream.
5 Oct
2011
5 Oct
'11
9:35 a.m.
Author: tfaber
Date: Wed Oct 5 09:35:25 2011
New Revision: 54004
URL: http://svn.reactos.org/svn/reactos?rev=54004&view=rev
Log:
[GDI32_WINETEST][KERNEL32_WINETEST]
- Fix MSVC build. Sent and applied upstream.
Modified:
trunk/rostests/winetests/gdi32/bitmap.c
trunk/rostests/winetests/gdi32/icm.c
trunk/rostests/winetests/kernel32/console.c
trunk/rostests/winetests/kernel32/file.c
trunk/rostests/winetests/kernel32/pipe.c
Modified: trunk/rostests/winetests/gdi32/bitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?…
==============================================================================
--- trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] Wed Oct 5 09:35:25 2011
@@ -816,8 +816,7 @@
static void test_dib_formats(void)
{
- char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256])];
- BITMAPINFO *bi = (BITMAPINFO *)buffer;
+ BITMAPINFO *bi;
char data[256];
void *bits;
//int planes, bpp, compr;
@@ -826,6 +825,7 @@
UINT ret;
//BOOL expect_ok, todo;
+ bi = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) );
hdc = GetDC( 0 );
memdc = CreateCompatibleDC( 0 );
hbmp = CreateCompatibleBitmap( hdc, 10, 10 );
@@ -1125,6 +1125,7 @@
DeleteDC( memdc );
DeleteObject( hbmp );
ReleaseDC( 0, hdc );
+ HeapFree( GetProcessHeap(), 0, bi );
}
static void test_mono_dibsection(void)
@@ -1450,10 +1451,8 @@
static void test_GetDIBits_selected_DIB(UINT bpp)
{
HBITMAP dib;
- char bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
- char bmibuf2[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
- BITMAPINFO *info = (BITMAPINFO *)bmibuf;
- BITMAPINFO *info2 = (BITMAPINFO *)bmibuf2;
+ BITMAPINFO *info;
+ BITMAPINFO *info2;
void * bits;
void * bits2;
UINT dib_size, dib32_size;
@@ -1462,6 +1461,9 @@
HBITMAP old_bmp;
UINT i;
int res;
+
+ info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256]));
+ info2 = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256]));
/* Create a DIB section with a color table */
@@ -1551,15 +1553,15 @@
SelectObject(dib_dc, old_bmp);
DeleteDC(dib_dc);
DeleteObject(dib);
+ HeapFree(GetProcessHeap(), 0, info2);
+ HeapFree(GetProcessHeap(), 0, info);
}
static void test_GetDIBits_selected_DDB(BOOL monochrome)
{
HBITMAP ddb;
- char bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
- char bmibuf2[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
- BITMAPINFO *info = (BITMAPINFO *)bmibuf;
- BITMAPINFO *info2 = (BITMAPINFO *)bmibuf2;
+ BITMAPINFO *info;
+ BITMAPINFO *info2;
void * bits;
void * bits2;
HDC ddb_dc, dc;
@@ -1568,6 +1570,9 @@
UINT bpp;
UINT i, j;
int res;
+
+ info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256]));
+ info2 = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256]));
width = height = 16;
@@ -1661,6 +1666,8 @@
SelectObject(ddb_dc, old_bmp);
DeleteDC(ddb_dc);
DeleteObject(ddb);
+ HeapFree(GetProcessHeap(), 0, info2);
+ HeapFree(GetProcessHeap(), 0, info);
}
static void test_GetDIBits(void)
@@ -3539,15 +3546,14 @@
static void test_GetDIBits_scanlines(void)
{
- char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ];
- BITMAPINFO *info = (BITMAPINFO *)bmi_buf;
+ BITMAPINFO *info;
DWORD *dib_bits;
HDC hdc = GetDC( NULL );
HBITMAP dib;
DWORD data[128], inverted_bits[64];
int i, ret;
- memset( info, 0, sizeof(bmi_buf) );
+ info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO,
bmiColors[256] ) );
info->bmiHeader.biSize = sizeof(info->bmiHeader);
info->bmiHeader.biWidth = 8;
@@ -3852,20 +3858,20 @@
DeleteObject( dib );
ReleaseDC( NULL, hdc );
+ HeapFree( GetProcessHeap(), 0, info );
}
static void test_SetDIBits(void)
{
- char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ];
- BITMAPINFO *info = (BITMAPINFO *)bmi_buf;
+ BITMAPINFO *info;
DWORD *dib_bits;
HDC hdc = GetDC( NULL );
DWORD data[128], inverted_data[128];
HBITMAP dib;
int i, ret;
- memset( info, 0, sizeof(bmi_buf) );
+ info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO,
bmiColors[256] ) );
info->bmiHeader.biSize = sizeof(info->bmiHeader);
info->bmiHeader.biWidth = 8;
@@ -4028,12 +4034,12 @@
DeleteObject( dib );
ReleaseDC( NULL, hdc );
+ HeapFree( GetProcessHeap(), 0, info );
}
static void test_SetDIBits_RLE4(void)
{
- char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ];
- BITMAPINFO *info = (BITMAPINFO *)bmi_buf;
+ BITMAPINFO *info;
DWORD *dib_bits;
HDC hdc = GetDC( NULL );
BYTE rle4_data[26] = { 0x03, 0x52, 0x07, 0x68, 0x00, 0x00, /* 5, 2, 5, 6, 8, 6,
8, 6, (8, 6,) <eol> */
@@ -4052,7 +4058,7 @@
0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa,
0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa,
0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa,
0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa };
- memset( info, 0, sizeof(bmi_buf) );
+ info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO,
bmiColors[256] ) );
info->bmiHeader.biSize = sizeof(info->bmiHeader);
info->bmiHeader.biWidth = 8;
@@ -4083,12 +4089,12 @@
DeleteObject( dib );
ReleaseDC( NULL, hdc );
+ HeapFree( GetProcessHeap(), 0, info );
}
static void test_SetDIBits_RLE8(void)
{
- char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ];
- BITMAPINFO *info = (BITMAPINFO *)bmi_buf;
+ BITMAPINFO *info;
DWORD *dib_bits;
HDC hdc = GetDC( NULL );
BYTE rle8_data[20] = { 0x03, 0x02, 0x04, 0xf0, 0x00, 0x00, /* 2, 2, 2, f0, f0,
f0, f0, <eol> */
@@ -4114,7 +4120,7 @@
0x00040404, 0x00050505, 0x00060606, 0xaaaaaaaa, 0xaaaaaaaa,
0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa,
0x00020202, 0x00020202, 0x00020202, 0x00f0f0f0, 0x00f0f0f0,
0x00f0f0f0, 0x00f0f0f0, 0xaaaaaaaa };
- memset( info, 0, sizeof(bmi_buf) );
+ info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO,
bmiColors[256] ) );
info->bmiHeader.biSize = sizeof(info->bmiHeader);
info->bmiHeader.biWidth = 8;
@@ -4232,21 +4238,20 @@
memset( dib_bits, 0xaa, 64 * 4 );
DeleteObject( dib );
-
ReleaseDC( NULL, hdc );
+ HeapFree( GetProcessHeap(), 0, info );
}
static void test_SetDIBitsToDevice(void)
{
- char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ];
- BITMAPINFO *info = (BITMAPINFO *)bmi_buf;
+ BITMAPINFO *info;
DWORD *dib_bits;
HDC hdc = CreateCompatibleDC( 0 );
DWORD data[128], inverted_data[128];
HBITMAP dib;
int i, ret;
- memset( info, 0, sizeof(bmi_buf) );
+ info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO,
bmiColors[256] ) );
info->bmiHeader.biSize = sizeof(info->bmiHeader);
info->bmiHeader.biWidth = 8;
@@ -4599,12 +4604,12 @@
DeleteDC( hdc );
DeleteObject( dib );
+ HeapFree( GetProcessHeap(), 0, info );
}
static void test_SetDIBitsToDevice_RLE8(void)
{
- char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ];
- BITMAPINFO *info = (BITMAPINFO *)bmi_buf;
+ BITMAPINFO *info;
DWORD *dib_bits;
HDC hdc = CreateCompatibleDC( 0 );
BYTE rle8_data[20] = { 0x04, 0x02, 0x03, 0xf0, 0x00, 0x00, /* 2, 2, 2, 2, f0, f0,
f0, <eol> */
@@ -4630,7 +4635,7 @@
0x00040404, 0x00050505, 0x00060606, 0xaaaaaaaa, 0xaaaaaaaa,
0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa,
0x00020202, 0x00020202, 0x00020202, 0x00020202, 0x00f0f0f0,
0x00f0f0f0, 0x00f0f0f0, 0xaaaaaaaa };
- memset( info, 0, sizeof(bmi_buf) );
+ info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO,
bmiColors[256] ) );
info->bmiHeader.biSize = sizeof(info->bmiHeader);
info->bmiHeader.biWidth = 8;
@@ -4820,6 +4825,7 @@
DeleteDC( hdc );
DeleteObject( dib );
+ HeapFree( GetProcessHeap(), 0, info );
}
START_TEST(bitmap)
Modified: trunk/rostests/winetests/gdi32/icm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/icm.c?rev…
==============================================================================
--- trunk/rostests/winetests/gdi32/icm.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdi32/icm.c [iso-8859-1] Wed Oct 5 09:35:25 2011
@@ -170,7 +170,7 @@
DeleteDC( dc );
}
-static CALLBACK INT enum_profiles_callbackA( LPSTR filename, LPARAM lparam )
+static INT CALLBACK enum_profiles_callbackA( LPSTR filename, LPARAM lparam )
{
trace("%s\n", filename);
return 1;
@@ -191,7 +191,7 @@
ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret);
}
-static CALLBACK INT enum_profiles_callbackW( LPWSTR filename, LPARAM lparam )
+static INT CALLBACK enum_profiles_callbackW( LPWSTR filename, LPARAM lparam )
{
return 1;
}
Modified: trunk/rostests/winetests/kernel32/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/consol…
==============================================================================
--- trunk/rostests/winetests/kernel32/console.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/console.c [iso-8859-1] Wed Oct 5 09:35:25 2011
@@ -1759,27 +1759,27 @@
int win7_crash;
} invalid_table[] =
{
- {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, output, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, output, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, output, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, output, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, output, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, output, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, output, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, output, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {output_handle, output, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, output, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, output, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, output, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, output, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, output, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, output, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, output, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, output, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, output, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {output_handle, output, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, output, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
@@ -1843,27 +1843,27 @@
int win7_crash;
} invalid_table[] =
{
- {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, outputW, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, outputW, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, outputW, 0, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, outputW, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, outputW, 1, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, outputW, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {output_handle, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, outputW, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, outputW, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, outputW, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, outputW, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, outputW, 0, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, outputW, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, outputW, 1, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, outputW, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {output_handle, outputW, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, outputW, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
@@ -1926,27 +1926,27 @@
int win7_crash;
} invalid_table[] =
{
- {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, &attr, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, &attr, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, &attr, 0, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, &attr, 0, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, &attr, 1, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, &attr, 1, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {output_handle, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, &attr, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, &attr, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, &attr, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, &attr, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, &attr, 0, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, &attr, 0, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, &attr, 1, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, &attr, 1, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {output_handle, &attr, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, &attr, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
@@ -2008,16 +2008,16 @@
int win7_crash;
} invalid_table[] =
{
- {NULL, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, 'a', 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, 'a', 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, 'a', 0, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, 'a', 0, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, 'a', 1, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, 'a', 1, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {output_handle, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {output_handle, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {NULL, 'a', 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, 'a', 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, 'a', 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, 'a', 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, 'a', 0, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, 'a', 0, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, 'a', 1, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, 'a', 1, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {output_handle, 'a', 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {output_handle, 'a', 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
@@ -2074,16 +2074,16 @@
int win7_crash;
} invalid_table[] =
{
- {NULL, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, 'a', 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, 'a', 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, 'a', 0, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, 'a', 0, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, 'a', 1, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, 'a', 1, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {output_handle, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {output_handle, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {NULL, 'a', 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, 'a', 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, 'a', 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, 'a', 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, 'a', 0, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, 'a', 0, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, 'a', 1, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, 'a', 1, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {output_handle, 'a', 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {output_handle, 'a', 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
@@ -2140,16 +2140,16 @@
int win7_crash;
} invalid_table[] =
{
- {NULL, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, FOREGROUND_BLUE, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, FOREGROUND_BLUE, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {output_handle, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {output_handle, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {NULL, FOREGROUND_BLUE, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, FOREGROUND_BLUE, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, FOREGROUND_BLUE, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, FOREGROUND_BLUE, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {output_handle, FOREGROUND_BLUE, 0, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {output_handle, FOREGROUND_BLUE, 1, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
@@ -2212,28 +2212,28 @@
int win7_crash;
} invalid_table[] =
{
- {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1},
- {NULL, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, &read, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, &read, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1},
- {INVALID_HANDLE_VALUE, &read, 0, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, &read, 0, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, &read, 1, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, &read, 1, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, &count, 1, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 10, origin, &count, 10, ERROR_INVALID_ACCESS, 1},
- {output_handle, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1},
+ {NULL, &read, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, &read, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, &read, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, &read, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1},
+ {INVALID_HANDLE_VALUE, &read, 0, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, &read, 0, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, &read, 1, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, &read, 1, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, &count, 1, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 10, {0, 0}, &count, 10, ERROR_INVALID_ACCESS, 1},
+ {output_handle, &read, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, &read, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
@@ -2296,28 +2296,28 @@
int win7_crash;
} invalid_table[] =
{
- {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1},
- {NULL, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, &read, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, &read, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1},
- {INVALID_HANDLE_VALUE, &read, 0, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, &read, 0, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, &read, 1, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, &read, 1, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, &count, 1, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 10, origin, &count, 10, ERROR_INVALID_ACCESS, 1},
- {output_handle, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1},
+ {NULL, &read, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, &read, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, &read, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, &read, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1},
+ {INVALID_HANDLE_VALUE, &read, 0, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, &read, 0, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, &read, 1, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, &read, 1, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, &count, 1, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 10, {0, 0}, &count, 10, ERROR_INVALID_ACCESS, 1},
+ {output_handle, &read, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, &read, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
@@ -2380,27 +2380,27 @@
int win7_crash;
} invalid_table[] =
{
- {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1},
- {NULL, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, &attr, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {NULL, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {NULL, &attr, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
- {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1},
- {INVALID_HANDLE_VALUE, &attr, 0, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, &attr, 0, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {INVALID_HANDLE_VALUE, &attr, 1, origin, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
- {INVALID_HANDLE_VALUE, &attr, 1, origin, &count, 0,
ERROR_INVALID_HANDLE},
- {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, NULL, 1, origin, &count, 1, ERROR_INVALID_ACCESS, 1},
- {output_handle, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
- {output_handle, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1},
+ {NULL, &attr, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, &attr, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {NULL, &attr, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {NULL, &attr, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS,
1},
+ {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1},
+ {INVALID_HANDLE_VALUE, &attr, 0, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, &attr, 0, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, &attr, 1, {0, 0}, NULL, 0xdeadbeef,
ERROR_INVALID_ACCESS, 1},
+ {INVALID_HANDLE_VALUE, &attr, 1, {0, 0}, &count, 0,
ERROR_INVALID_HANDLE},
+ {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, NULL, 1, {0, 0}, &count, 1, ERROR_INVALID_ACCESS, 1},
+ {output_handle, &attr, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
+ {output_handle, &attr, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
Modified: trunk/rostests/winetests/kernel32/file.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c…
==============================================================================
--- trunk/rostests/winetests/kernel32/file.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/file.c [iso-8859-1] Wed Oct 5 09:35:25 2011
@@ -38,7 +38,7 @@
static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID);
static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT);
static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD);
-static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData);
+static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData);
/* keep filename and filenameW the same */
static const char filename[] = "testfile.xxx";
Modified: trunk/rostests/winetests/kernel32/pipe.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c…
==============================================================================
--- trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] Wed Oct 5 09:35:25 2011
@@ -37,7 +37,7 @@
static HANDLE alarm_event;
static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,
SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE);
-static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData);
+static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData);
static BOOL user_apc_ran;
static void CALLBACK user_apc(ULONG_PTR param)
5010
days inactive
5010
days old
0 comments
1 participants
participants (1)
-
tfaber＠svn.reactos.org