Updated the generated tests.

This commit is contained in:
Patrik Stridvall 2002-10-29 21:24:09 +00:00 committed by Alexandre Julliard
parent 1a6898b8ef
commit 7d226139e9
4 changed files with 80 additions and 68 deletions

View file

@ -6,12 +6,22 @@
*/
#define WINVER 0x0501
#define _WIN32_WINNT 0x0501
#define WINE_NOWINSOCK
#include "windows.h"
#include "wine/test.h"
/***********************************************************************
* Compability macros
*/
#define DWORD_PTR UINT_PTR
#define LONG_PTR INT_PTR
#define ULONG_PTR UINT_PTR
/***********************************************************************
* Windows API extension
*/
@ -223,23 +233,17 @@ void test_pack(void)
TEST_FIELD(DIBSECTION, HANDLE, dshSection, 76, 4, 4);
TEST_FIELD(DIBSECTION, DWORD, dsOffset, 80, 4, 4);
/* DISPLAY_DEVICEA (pack 4) */
TEST_TYPE(DISPLAY_DEVICEA, 424, 4);
/* DISPLAY_DEVICEA */
TEST_FIELD(DISPLAY_DEVICEA, DWORD, cb, 0, 4, 4);
TEST_FIELD(DISPLAY_DEVICEA, CHAR[32], DeviceName, 4, 32, 1);
TEST_FIELD(DISPLAY_DEVICEA, CHAR[128], DeviceString, 36, 128, 1);
TEST_FIELD(DISPLAY_DEVICEA, DWORD, StateFlags, 164, 4, 4);
TEST_FIELD(DISPLAY_DEVICEA, CHAR[128], DeviceID, 168, 128, 1);
TEST_FIELD(DISPLAY_DEVICEA, CHAR[128], DeviceKey, 296, 128, 1);
/* DISPLAY_DEVICEW (pack 4) */
TEST_TYPE(DISPLAY_DEVICEW, 840, 4);
/* DISPLAY_DEVICEW */
TEST_FIELD(DISPLAY_DEVICEW, DWORD, cb, 0, 4, 4);
TEST_FIELD(DISPLAY_DEVICEW, WCHAR[32], DeviceName, 4, 64, 2);
TEST_FIELD(DISPLAY_DEVICEW, WCHAR[128], DeviceString, 68, 256, 2);
TEST_FIELD(DISPLAY_DEVICEW, DWORD, StateFlags, 324, 4, 4);
TEST_FIELD(DISPLAY_DEVICEW, WCHAR[128], DeviceID, 328, 256, 2);
TEST_FIELD(DISPLAY_DEVICEW, WCHAR[128], DeviceKey, 584, 256, 2);
/* DOCINFOA (pack 4) */
TEST_TYPE(DOCINFOA, 20, 4);
@ -306,21 +310,6 @@ void test_pack(void)
TEST_FIELD(EMRCREATEBRUSHINDIRECT, DWORD, ihBrush, 8, 4, 4);
TEST_FIELD(EMRCREATEBRUSHINDIRECT, LOGBRUSH, lb, 12, 12, 4);
/* EMRCREATECOLORSPACE (pack 4) */
TEST_TYPE(EMRCREATECOLORSPACE, 340, 4);
TEST_FIELD(EMRCREATECOLORSPACE, EMR, emr, 0, 8, 4);
TEST_FIELD(EMRCREATECOLORSPACE, DWORD, ihCS, 8, 4, 4);
TEST_FIELD(EMRCREATECOLORSPACE, LOGCOLORSPACEA, lcs, 12, 328, 4);
/* EMRCREATECOLORSPACEW (pack 4) */
TEST_TYPE(EMRCREATECOLORSPACEW, 612, 4);
TEST_FIELD(EMRCREATECOLORSPACEW, EMR, emr, 0, 8, 4);
TEST_FIELD(EMRCREATECOLORSPACEW, DWORD, ihCS, 8, 4, 4);
TEST_FIELD(EMRCREATECOLORSPACEW, LOGCOLORSPACEW, lcs, 12, 588, 4);
TEST_FIELD(EMRCREATECOLORSPACEW, DWORD, dwFlags, 600, 4, 4);
TEST_FIELD(EMRCREATECOLORSPACEW, DWORD, cbData, 604, 4, 4);
TEST_FIELD(EMRCREATECOLORSPACEW, BYTE[1], Data, 608, 1, 1);
/* EMRCREATEDIBPATTERNBRUSHPT (pack 4) */
TEST_TYPE(EMRCREATEDIBPATTERNBRUSHPT, 32, 4);
TEST_FIELD(EMRCREATEDIBPATTERNBRUSHPT, EMR, emr, 0, 8, 4);
@ -628,23 +617,23 @@ void test_pack(void)
TEST_FIELD(EMRSETCOLORADJUSTMENT, EMR, emr, 0, 8, 4);
TEST_FIELD(EMRSETCOLORADJUSTMENT, COLORADJUSTMENT, ColorAdjustment, 8, 24, 2);
/* EMRSETDIBITSTODEIVCE (pack 4) */
TEST_TYPE(EMRSETDIBITSTODEIVCE, 76, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, EMR, emr, 0, 8, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, RECTL, rclBounds, 8, 16, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, LONG, xDest, 24, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, LONG, yDest, 28, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, LONG, xSrc, 32, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, LONG, ySrc, 36, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, LONG, cxSrc, 40, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, LONG, cySrc, 44, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, DWORD, offBmiSrc, 48, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, DWORD, cbBmiSrc, 52, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, DWORD, offBitsSrc, 56, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, DWORD, cbBitsSrc, 60, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, DWORD, iUsageSrc, 64, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, DWORD, iStartScan, 68, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEIVCE, DWORD, cScans, 72, 4, 4);
/* EMRSETDIBITSTODEVICE (pack 4) */
TEST_TYPE(EMRSETDIBITSTODEVICE, 76, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, EMR, emr, 0, 8, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, RECTL, rclBounds, 8, 16, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, LONG, xDest, 24, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, LONG, yDest, 28, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, LONG, xSrc, 32, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, LONG, ySrc, 36, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, LONG, cxSrc, 40, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, LONG, cySrc, 44, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, DWORD, offBmiSrc, 48, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, DWORD, cbBmiSrc, 52, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, DWORD, offBitsSrc, 56, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, DWORD, cbBitsSrc, 60, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, DWORD, iUsageSrc, 64, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, DWORD, iStartScan, 68, 4, 4);
TEST_FIELD(EMRSETDIBITSTODEVICE, DWORD, cScans, 72, 4, 4);
/* EMRSETMAPPERFLAGS (pack 4) */
TEST_TYPE(EMRSETMAPPERFLAGS, 12, 4);
@ -662,12 +651,6 @@ void test_pack(void)
TEST_FIELD(EMRSETPIXELV, POINTL, ptlPixel, 8, 8, 4);
TEST_FIELD(EMRSETPIXELV, COLORREF, crColor, 16, 4, 4);
/* EMRSETTEXTJUSTIFICATION (pack 4) */
TEST_TYPE(EMRSETTEXTJUSTIFICATION, 16, 4);
TEST_FIELD(EMRSETTEXTJUSTIFICATION, EMR, emr, 0, 8, 4);
TEST_FIELD(EMRSETTEXTJUSTIFICATION, INT, nBreakExtra, 8, 4, 4);
TEST_FIELD(EMRSETTEXTJUSTIFICATION, INT, nBreakCount, 12, 4, 4);
/* EMRSETVIEWPORTEXTEX (pack 4) */
TEST_TYPE(EMRSETVIEWPORTEXTEX, 16, 4);
TEST_FIELD(EMRSETVIEWPORTEXTEX, EMR, emr, 0, 8, 4);
@ -727,8 +710,7 @@ void test_pack(void)
TEST_FIELD(EMRTEXT, RECTL, rcl, 20, 16, 4);
TEST_FIELD(EMRTEXT, DWORD, offDx, 36, 4, 4);
/* ENHMETAHEADER (pack 4) */
TEST_TYPE(ENHMETAHEADER, 108, 4);
/* ENHMETAHEADER */
TEST_FIELD(ENHMETAHEADER, DWORD, iType, 0, 4, 4);
TEST_FIELD(ENHMETAHEADER, DWORD, nSize, 4, 4, 4);
TEST_FIELD(ENHMETAHEADER, RECTL, rclBounds, 8, 16, 4);
@ -747,7 +729,6 @@ void test_pack(void)
TEST_FIELD(ENHMETAHEADER, DWORD, cbPixelFormat, 88, 4, 4);
TEST_FIELD(ENHMETAHEADER, DWORD, offPixelFormat, 92, 4, 4);
TEST_FIELD(ENHMETAHEADER, DWORD, bOpenGL, 96, 4, 4);
TEST_FIELD(ENHMETAHEADER, SIZEL, szlMicrometers, 100, 8, 4);
/* ENHMETARECORD (pack 4) */
TEST_TYPE(ENHMETARECORD, 12, 4);

View file

@ -6,12 +6,22 @@
*/
#define WINVER 0x0501
#define _WIN32_WINNT 0x0501
#define WINE_NOWINSOCK
#include "windows.h"
#include "wine/test.h"
/***********************************************************************
* Compability macros
*/
#define DWORD_PTR UINT_PTR
#define LONG_PTR INT_PTR
#define ULONG_PTR UINT_PTR
/***********************************************************************
* Windows API extension
*/
@ -222,8 +232,7 @@ void test_pack(void)
TEST_FIELD(OSVERSIONINFOA, DWORD, dwPlatformId, 16, 4, 4);
TEST_FIELD(OSVERSIONINFOA, CHAR[128], szCSDVersion, 20, 128, 1);
/* OSVERSIONINFOEXA (pack 4) */
TEST_TYPE(OSVERSIONINFOEXA, 156, 4);
/* OSVERSIONINFOEXA */
TEST_FIELD(OSVERSIONINFOEXA, DWORD, dwOSVersionInfoSize, 0, 4, 4);
TEST_FIELD(OSVERSIONINFOEXA, DWORD, dwMajorVersion, 4, 4, 4);
TEST_FIELD(OSVERSIONINFOEXA, DWORD, dwMinorVersion, 8, 4, 4);
@ -232,12 +241,8 @@ void test_pack(void)
TEST_FIELD(OSVERSIONINFOEXA, CHAR[128], szCSDVersion, 20, 128, 1);
TEST_FIELD(OSVERSIONINFOEXA, WORD, wServicePackMajor, 148, 2, 2);
TEST_FIELD(OSVERSIONINFOEXA, WORD, wServicePackMinor, 150, 2, 2);
TEST_FIELD(OSVERSIONINFOEXA, WORD, wSuiteMask, 152, 2, 2);
TEST_FIELD(OSVERSIONINFOEXA, BYTE, wProductType, 154, 1, 1);
TEST_FIELD(OSVERSIONINFOEXA, BYTE, wReserved, 155, 1, 1);
/* OSVERSIONINFOEXW (pack 4) */
TEST_TYPE(OSVERSIONINFOEXW, 284, 4);
/* OSVERSIONINFOEXW */
TEST_FIELD(OSVERSIONINFOEXW, DWORD, dwOSVersionInfoSize, 0, 4, 4);
TEST_FIELD(OSVERSIONINFOEXW, DWORD, dwMajorVersion, 4, 4, 4);
TEST_FIELD(OSVERSIONINFOEXW, DWORD, dwMinorVersion, 8, 4, 4);
@ -246,9 +251,6 @@ void test_pack(void)
TEST_FIELD(OSVERSIONINFOEXW, WCHAR[128], szCSDVersion, 20, 256, 2);
TEST_FIELD(OSVERSIONINFOEXW, WORD, wServicePackMajor, 276, 2, 2);
TEST_FIELD(OSVERSIONINFOEXW, WORD, wServicePackMinor, 278, 2, 2);
TEST_FIELD(OSVERSIONINFOEXW, WORD, wSuiteMask, 280, 2, 2);
TEST_FIELD(OSVERSIONINFOEXW, BYTE, wProductType, 282, 1, 1);
TEST_FIELD(OSVERSIONINFOEXW, BYTE, wReserved, 283, 1, 1);
/* OSVERSIONINFOW (pack 4) */
TEST_TYPE(OSVERSIONINFOW, 276, 4);

View file

@ -6,12 +6,22 @@
*/
#define WINVER 0x0501
#define _WIN32_WINNT 0x0501
#define WINE_NOWINSOCK
#include "windows.h"
#include "wine/test.h"
/***********************************************************************
* Compability macros
*/
#define DWORD_PTR UINT_PTR
#define LONG_PTR INT_PTR
#define ULONG_PTR UINT_PTR
/***********************************************************************
* Windows API extension
*/
@ -344,12 +354,10 @@ void test_pack(void)
TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_swaparea, 60, 2, 2);
TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_expver, 62, 2, 2);
/* IMAGE_RESOURCE_DATA_ENTRY (pack 4) */
TEST_TYPE(IMAGE_RESOURCE_DATA_ENTRY, 16, 4);
/* IMAGE_RESOURCE_DATA_ENTRY */
TEST_FIELD(IMAGE_RESOURCE_DATA_ENTRY, DWORD, OffsetToData, 0, 4, 4);
TEST_FIELD(IMAGE_RESOURCE_DATA_ENTRY, DWORD, Size, 4, 4, 4);
TEST_FIELD(IMAGE_RESOURCE_DATA_ENTRY, DWORD, CodePage, 8, 4, 4);
TEST_FIELD(IMAGE_RESOURCE_DATA_ENTRY, DWORD, ResourceHandle, 12, 4, 4);
/* IMAGE_RESOURCE_DIRECTORY (pack 4) */
TEST_TYPE(IMAGE_RESOURCE_DIRECTORY, 16, 4);

View file

@ -6,12 +6,22 @@
*/
#define WINVER 0x0501
#define _WIN32_WINNT 0x0501
#define WINE_NOWINSOCK
#include "windows.h"
#include "wine/test.h"
/***********************************************************************
* Compability macros
*/
#define DWORD_PTR UINT_PTR
#define LONG_PTR INT_PTR
#define ULONG_PTR UINT_PTR
/***********************************************************************
* Windows API extension
*/
@ -66,7 +76,6 @@ void test_pack(void)
/* ACCEL (pack 4) */
TEST_TYPE(ACCEL, 6, 2);
TEST_FIELD(ACCEL, BYTE, fVirt, 0, 1, 1);
TEST_FIELD(ACCEL, BYTE, pad0, 1, 1, 1);
TEST_FIELD(ACCEL, WORD, key, 2, 2, 2);
TEST_FIELD(ACCEL, WORD, cmd, 4, 2, 2);
@ -443,12 +452,26 @@ void test_pack(void)
/* MONITORINFOEXA (pack 4) */
TEST_TYPE(MONITORINFOEXA, 72, 4);
TEST_FIELD(MONITORINFOEXA, MONITORINFO, dummy, 0, 40, 4);
#ifdef NONAMELESSSTRUCT
TEST_FIELD(MONITORINFOEXA, MONITORINFO, DUMMYSTRUCTNAME, 0, 40, 4);
#else
TEST_FIELD(MONITORINFOEXA, DWORD, cbSize, 0, 4, 4);
TEST_FIELD(MONITORINFOEXA, RECT, rcMonitor, 4, 16, 4);
TEST_FIELD(MONITORINFOEXA, RECT, rcWork, 20, 16, 4);
TEST_FIELD(MONITORINFOEXA, DWORD, dwFlags, 36, 4, 4);
#endif
TEST_FIELD(MONITORINFOEXA, CHAR[CCHDEVICENAME], szDevice, 40, 32, 1);
/* MONITORINFOEXW (pack 4) */
TEST_TYPE(MONITORINFOEXW, 104, 4);
TEST_FIELD(MONITORINFOEXW, MONITORINFO, dummy, 0, 40, 4);
#ifdef NONAMELESSSTRUCT
TEST_FIELD(MONITORINFOEXW, MONITORINFO, DUMMYSTRUCTNAME, 0, 40, 4);
#else
TEST_FIELD(MONITORINFOEXW, DWORD, cbSize, 0, 4, 4);
TEST_FIELD(MONITORINFOEXW, RECT, rcMonitor, 4, 16, 4);
TEST_FIELD(MONITORINFOEXW, RECT, rcWork, 20, 16, 4);
TEST_FIELD(MONITORINFOEXW, DWORD, dwFlags, 36, 4, 4);
#endif
TEST_FIELD(MONITORINFOEXW, WCHAR[CCHDEVICENAME], szDevice, 40, 64, 2);
/* MOUSEHOOKSTRUCT (pack 4) */
@ -675,14 +698,12 @@ void test_pack(void)
TEST_FIELD(TRACKMOUSEEVENT, HWND, hwndTrack, 8, 4, 4);
TEST_FIELD(TRACKMOUSEEVENT, DWORD, dwHoverTime, 12, 4, 4);
/* WINDOWINFO (pack 4) */
TEST_TYPE(WINDOWINFO, 60, 4);
/* WINDOWINFO */
TEST_FIELD(WINDOWINFO, DWORD, cbSize, 0, 4, 4);
TEST_FIELD(WINDOWINFO, RECT, rcWindow, 4, 16, 4);
TEST_FIELD(WINDOWINFO, RECT, rcClient, 20, 16, 4);
TEST_FIELD(WINDOWINFO, DWORD, dwStyle, 36, 4, 4);
TEST_FIELD(WINDOWINFO, DWORD, dwExStyle, 40, 4, 4);
TEST_FIELD(WINDOWINFO, DWORD, dwWindowStatus, 44, 4, 4);
TEST_FIELD(WINDOWINFO, UINT, cxWindowBorders, 48, 4, 4);
TEST_FIELD(WINDOWINFO, UINT, cyWindowBorders, 52, 4, 4);
TEST_FIELD(WINDOWINFO, ATOM, atomWindowType, 56, 2, 2);