diff --git a/dlls/gdi/tests/generated.c b/dlls/gdi/tests/generated.c index 39bd0417f50..30699e4cc83 100644 --- a/dlls/gdi/tests/generated.c +++ b/dlls/gdi/tests/generated.c @@ -5,13 +5,12 @@ * Unit tests for data structure packing */ -#include +#define WINVER 0x0501 +#define WINE_NOWINSOCK + +#include "windows.h" #include "wine/test.h" -#include "basetsd.h" -#include "winnt.h" -#include "windef.h" -#include "wingdi.h" /*********************************************************************** * Windows API extension @@ -133,7 +132,7 @@ void test_pack(void) TEST_FIELD(BITMAPV4HEADER, LONG, bV4Height, 8, 4, 4); TEST_FIELD(BITMAPV4HEADER, WORD, bV4Planes, 12, 2, 2); TEST_FIELD(BITMAPV4HEADER, WORD, bV4BitCount, 14, 2, 2); - TEST_FIELD(BITMAPV4HEADER, DWORD, bV4Compression, 16, 4, 4); + TEST_FIELD(BITMAPV4HEADER, DWORD, bV4V4Compression, 16, 4, 4); TEST_FIELD(BITMAPV4HEADER, DWORD, bV4SizeImage, 20, 4, 4); TEST_FIELD(BITMAPV4HEADER, LONG, bV4XPelsPerMeter, 24, 4, 4); TEST_FIELD(BITMAPV4HEADER, LONG, bV4YPelsPerMeter, 28, 4, 4); @@ -429,7 +428,7 @@ void test_pack(void) /* EMRFORMAT (pack 4) */ TEST_TYPE(EMRFORMAT, 16, 4); - TEST_FIELD(EMRFORMAT, DWORD, signature, 0, 4, 4); + TEST_FIELD(EMRFORMAT, DWORD, dSignature, 0, 4, 4); TEST_FIELD(EMRFORMAT, DWORD, nVersion, 4, 4, 4); TEST_FIELD(EMRFORMAT, DWORD, cbData, 8, 4, 4); TEST_FIELD(EMRFORMAT, DWORD, offData, 12, 4, 4); @@ -520,7 +519,7 @@ void test_pack(void) TEST_TYPE(EMRPLGBLT, 140, 4); TEST_FIELD(EMRPLGBLT, EMR, emr, 0, 8, 4); TEST_FIELD(EMRPLGBLT, RECTL, rclBounds, 8, 16, 4); - TEST_FIELD(EMRPLGBLT, POINTL[3], aptlDst, 24, 24, 4); + TEST_FIELD(EMRPLGBLT, POINTL[3], aptlDest, 24, 24, 4); TEST_FIELD(EMRPLGBLT, LONG, xSrc, 48, 4, 4); TEST_FIELD(EMRPLGBLT, LONG, ySrc, 52, 4, 4); TEST_FIELD(EMRPLGBLT, LONG, cxSrc, 56, 4, 4); diff --git a/dlls/kernel/tests/generated.c b/dlls/kernel/tests/generated.c index cbd062b3917..97f8d5fc068 100644 --- a/dlls/kernel/tests/generated.c +++ b/dlls/kernel/tests/generated.c @@ -5,13 +5,12 @@ * Unit tests for data structure packing */ -#include +#define WINVER 0x0501 +#define WINE_NOWINSOCK + +#include "windows.h" #include "wine/test.h" -#include "basetsd.h" -#include "winnt.h" -#include "windef.h" -#include "winbase.h" /*********************************************************************** * Windows API extension @@ -119,7 +118,6 @@ void test_pack(void) /* COMSTAT (pack 4) */ TEST_TYPE(COMSTAT, 12, 4); - TEST_FIELD(COMSTAT, DWORD, status, 0, 4, 4); TEST_FIELD(COMSTAT, DWORD, cbInQue, 4, 4, 4); TEST_FIELD(COMSTAT, DWORD, cbOutQue, 8, 4, 4); @@ -211,7 +209,8 @@ void test_pack(void) TEST_FIELD(OFSTRUCT, BYTE, cBytes, 0, 1, 1); TEST_FIELD(OFSTRUCT, BYTE, fFixedDisk, 1, 1, 1); TEST_FIELD(OFSTRUCT, WORD, nErrCode, 2, 2, 2); - TEST_FIELD(OFSTRUCT, BYTE[4], reserved, 4, 4, 1); + TEST_FIELD(OFSTRUCT, WORD, Reserved1, 4, 2, 2); + TEST_FIELD(OFSTRUCT, WORD, Reserved2, 6, 2, 2); TEST_FIELD(OFSTRUCT, BYTE[OFS_MAXPATHNAME], szPathName, 8, 128, 1); /* OSVERSIONINFOA (pack 4) */ @@ -341,11 +340,6 @@ void test_pack(void) TEST_FIELD(STARTUPINFOW, HANDLE, hStdOutput, 60, 4, 4); TEST_FIELD(STARTUPINFOW, HANDLE, hStdError, 64, 4, 4); - /* SYSLEVEL (pack 4) */ - TEST_TYPE(SYSLEVEL, 28, 4); - TEST_FIELD(SYSLEVEL, CRITICAL_SECTION, crst, 0, 24, 4); - TEST_FIELD(SYSLEVEL, INT, level, 24, 4, 4); - /* SYSTEMTIME (pack 4) */ TEST_TYPE(SYSTEMTIME, 16, 2); TEST_FIELD(SYSTEMTIME, WORD, wYear, 0, 2, 2); @@ -362,7 +356,7 @@ void test_pack(void) TEST_FIELD(SYSTEM_POWER_STATUS, BYTE, ACLineStatus, 0, 1, 1); TEST_FIELD(SYSTEM_POWER_STATUS, BYTE, BatteryFlag, 1, 1, 1); TEST_FIELD(SYSTEM_POWER_STATUS, BYTE, BatteryLifePercent, 2, 1, 1); - TEST_FIELD(SYSTEM_POWER_STATUS, BYTE, reserved, 3, 1, 1); + TEST_FIELD(SYSTEM_POWER_STATUS, BYTE, Reserved1, 3, 1, 1); TEST_FIELD(SYSTEM_POWER_STATUS, DWORD, BatteryLifeTime, 4, 4, 4); TEST_FIELD(SYSTEM_POWER_STATUS, DWORD, BatteryFullLifeTime, 8, 4, 4); @@ -417,7 +411,7 @@ void test_pack(void) /* WIN32_STREAM_ID (pack 4) */ TEST_TYPE(WIN32_STREAM_ID, 24, 4); - TEST_FIELD(WIN32_STREAM_ID, DWORD, dwStreamID, 0, 4, 4); + TEST_FIELD(WIN32_STREAM_ID, DWORD, dwStreamId, 0, 4, 4); TEST_FIELD(WIN32_STREAM_ID, DWORD, dwStreamAttributes, 4, 4, 4); TEST_FIELD(WIN32_STREAM_ID, LARGE_INTEGER, Size, 8, 8, 4); TEST_FIELD(WIN32_STREAM_ID, DWORD, dwStreamNameSize, 16, 4, 4); diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index eec9656ef2b..5d562e00cd6 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -5,12 +5,12 @@ * Unit tests for data structure packing */ -#include +#define WINVER 0x0501 +#define WINE_NOWINSOCK + +#include "windows.h" #include "wine/test.h" -#include "basetsd.h" -#include "winnt.h" -#include "windef.h" /*********************************************************************** * Windows API extension @@ -89,34 +89,6 @@ void test_pack(void) TEST_FIELD(ACL, WORD, AceCount, 4, 2, 2); TEST_FIELD(ACL, WORD, Sbz2, 6, 2, 2); - /* CONTEXT86 (pack 4) */ - TEST_TYPE(CONTEXT86, 716, 4); - TEST_FIELD(CONTEXT86, DWORD, ContextFlags, 0, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Dr0, 4, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Dr1, 8, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Dr2, 12, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Dr3, 16, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Dr6, 20, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Dr7, 24, 4, 4); - TEST_FIELD(CONTEXT86, FLOATING_SAVE_AREA, FloatSave, 28, 112, 4); - TEST_FIELD(CONTEXT86, DWORD, SegGs, 140, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, SegFs, 144, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, SegEs, 148, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, SegDs, 152, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Edi, 156, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Esi, 160, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Ebx, 164, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Edx, 168, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Ecx, 172, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Eax, 176, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Ebp, 180, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Eip, 184, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, SegCs, 188, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, EFlags, 192, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, Esp, 196, 4, 4); - TEST_FIELD(CONTEXT86, DWORD, SegSs, 200, 4, 4); - TEST_FIELD(CONTEXT86, BYTE[MAXIMUM_SUPPORTED_EXTENSION], ExtendedRegisters, 204, 512, 1); - /* EXCEPTION_POINTERS (pack 4) */ TEST_TYPE(EXCEPTION_POINTERS, 8, 4); TEST_FIELD(EXCEPTION_POINTERS, PEXCEPTION_RECORD, ExceptionRecord, 0, 4, 4); @@ -221,8 +193,8 @@ void test_pack(void) TEST_FIELD(IMAGE_DEBUG_MISC, BYTE[ 3 ], Reserved, 9, 3, 1); TEST_FIELD(IMAGE_DEBUG_MISC, BYTE[ 1 ], Data, 12, 1, 1); - /* IMAGE_DOS_HEADER (pack 4) */ - TEST_TYPE(IMAGE_DOS_HEADER, 64, 4); + /* IMAGE_DOS_HEADER (pack 2) */ + TEST_TYPE(IMAGE_DOS_HEADER, 64, 2); TEST_FIELD(IMAGE_DOS_HEADER, WORD, e_magic, 0, 2, 2); TEST_FIELD(IMAGE_DOS_HEADER, WORD, e_cblp, 2, 2, 2); TEST_FIELD(IMAGE_DOS_HEADER, WORD, e_cp, 4, 2, 2); @@ -241,7 +213,7 @@ void test_pack(void) TEST_FIELD(IMAGE_DOS_HEADER, WORD, e_oemid, 36, 2, 2); TEST_FIELD(IMAGE_DOS_HEADER, WORD, e_oeminfo, 38, 2, 2); TEST_FIELD(IMAGE_DOS_HEADER, WORD[10], e_res2, 40, 20, 2); - TEST_FIELD(IMAGE_DOS_HEADER, DWORD, e_lfanew, 60, 4, 4); + TEST_FIELD(IMAGE_DOS_HEADER, DWORD, e_lfanew, 60, 4, 2); /* IMAGE_EXPORT_DIRECTORY (pack 4) */ TEST_TYPE(IMAGE_EXPORT_DIRECTORY, 40, 4); @@ -339,20 +311,20 @@ void test_pack(void) TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, NumberOfRvaAndSizes, 92, 4, 4); TEST_FIELD(IMAGE_OPTIONAL_HEADER, IMAGE_DATA_DIRECTORY[IMAGE_NUMBEROF_DIRECTORY_ENTRIES], DataDirectory, 96, 128, 4); - /* IMAGE_OS2_HEADER (pack 4) */ - TEST_TYPE(IMAGE_OS2_HEADER, 64, 4); + /* IMAGE_OS2_HEADER (pack 2) */ + TEST_TYPE(IMAGE_OS2_HEADER, 64, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_magic, 0, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, BYTE, ne_ver, 2, 1, 1); TEST_FIELD(IMAGE_OS2_HEADER, BYTE, ne_rev, 3, 1, 1); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_enttab, 4, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_cbenttab, 6, 2, 2); - TEST_FIELD(IMAGE_OS2_HEADER, LONG, ne_crc, 8, 4, 4); + TEST_FIELD(IMAGE_OS2_HEADER, LONG, ne_crc, 8, 4, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_flags, 12, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_autodata, 14, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_heap, 16, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_stack, 18, 2, 2); - TEST_FIELD(IMAGE_OS2_HEADER, DWORD, ne_csip, 20, 4, 4); - TEST_FIELD(IMAGE_OS2_HEADER, DWORD, ne_sssp, 24, 4, 4); + TEST_FIELD(IMAGE_OS2_HEADER, DWORD, ne_csip, 20, 4, 2); + TEST_FIELD(IMAGE_OS2_HEADER, DWORD, ne_sssp, 24, 4, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_cseg, 28, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_cmod, 30, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_cbnrestab, 32, 2, 2); @@ -361,14 +333,14 @@ void test_pack(void) TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_restab, 38, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_modtab, 40, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_imptab, 42, 2, 2); - TEST_FIELD(IMAGE_OS2_HEADER, DWORD, ne_nrestab, 44, 4, 4); + TEST_FIELD(IMAGE_OS2_HEADER, DWORD, ne_nrestab, 44, 4, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_cmovent, 48, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_align, 50, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_cres, 52, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, BYTE, ne_exetyp, 54, 1, 1); TEST_FIELD(IMAGE_OS2_HEADER, BYTE, ne_flagsothers, 55, 1, 1); - TEST_FIELD(IMAGE_OS2_HEADER, WORD, fastload_offset, 56, 2, 2); - TEST_FIELD(IMAGE_OS2_HEADER, WORD, fastload_length, 58, 2, 2); + TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_pretthunks, 56, 2, 2); + TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_psegrefbytes, 58, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_swaparea, 60, 2, 2); TEST_FIELD(IMAGE_OS2_HEADER, WORD, ne_expver, 62, 2, 2); @@ -427,57 +399,57 @@ void test_pack(void) TEST_FIELD(IMAGE_TLS_DIRECTORY, DWORD, SizeOfZeroFill, 16, 4, 4); TEST_FIELD(IMAGE_TLS_DIRECTORY, DWORD, Characteristics, 20, 4, 4); - /* IMAGE_VXD_HEADER (pack 4) */ - TEST_TYPE(IMAGE_VXD_HEADER, 196, 4); + /* IMAGE_VXD_HEADER (pack 2) */ + TEST_TYPE(IMAGE_VXD_HEADER, 196, 2); TEST_FIELD(IMAGE_VXD_HEADER, WORD, e32_magic, 0, 2, 2); TEST_FIELD(IMAGE_VXD_HEADER, BYTE, e32_border, 2, 1, 1); TEST_FIELD(IMAGE_VXD_HEADER, BYTE, e32_worder, 3, 1, 1); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_level, 4, 4, 4); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_level, 4, 4, 2); TEST_FIELD(IMAGE_VXD_HEADER, WORD, e32_cpu, 8, 2, 2); TEST_FIELD(IMAGE_VXD_HEADER, WORD, e32_os, 10, 2, 2); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_ver, 12, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_mflags, 16, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_mpages, 20, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_startobj, 24, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_eip, 28, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_stackobj, 32, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_esp, 36, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_pagesize, 40, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_lastpagesize, 44, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_fixupsize, 48, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_fixupsum, 52, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_ldrsize, 56, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_ldrsum, 60, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_objtab, 64, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_objcnt, 68, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_objmap, 72, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_itermap, 76, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_rsrctab, 80, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_rsrccnt, 84, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_restab, 88, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_enttab, 92, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_dirtab, 96, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_dircnt, 100, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_fpagetab, 104, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_frectab, 108, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_impmod, 112, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_impmodcnt, 116, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_impproc, 120, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_pagesum, 124, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_datapage, 128, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_preload, 132, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_nrestab, 136, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_cbnrestab, 140, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_nressum, 144, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_autodata, 148, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_debuginfo, 152, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_debuglen, 156, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_instpreload, 160, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_instdemand, 164, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_heapsize, 168, 4, 4); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_ver, 12, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_mflags, 16, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_mpages, 20, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_startobj, 24, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_eip, 28, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_stackobj, 32, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_esp, 36, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_pagesize, 40, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_lastpagesize, 44, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_fixupsize, 48, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_fixupsum, 52, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_ldrsize, 56, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_ldrsum, 60, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_objtab, 64, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_objcnt, 68, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_objmap, 72, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_itermap, 76, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_rsrctab, 80, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_rsrccnt, 84, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_restab, 88, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_enttab, 92, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_dirtab, 96, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_dircnt, 100, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_fpagetab, 104, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_frectab, 108, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_impmod, 112, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_impmodcnt, 116, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_impproc, 120, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_pagesum, 124, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_datapage, 128, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_preload, 132, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_nrestab, 136, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_cbnrestab, 140, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_nressum, 144, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_autodata, 148, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_debuginfo, 152, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_debuglen, 156, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_instpreload, 160, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_instdemand, 164, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_heapsize, 168, 4, 2); TEST_FIELD(IMAGE_VXD_HEADER, BYTE[12], e32_res3, 172, 12, 1); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_winresoff, 184, 4, 4); - TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_winreslen, 188, 4, 4); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_winresoff, 184, 4, 2); + TEST_FIELD(IMAGE_VXD_HEADER, DWORD, e32_winreslen, 188, 4, 2); TEST_FIELD(IMAGE_VXD_HEADER, WORD, e32_devid, 192, 2, 2); TEST_FIELD(IMAGE_VXD_HEADER, WORD, e32_ddkver, 194, 2, 2); @@ -624,7 +596,7 @@ void test_pack(void) /* TOKEN_SOURCE (pack 4) */ TEST_TYPE(TOKEN_SOURCE, 16, 4); - TEST_FIELD(TOKEN_SOURCE, char[8], Sourcename, 0, 8, 1); + TEST_FIELD(TOKEN_SOURCE, char[TOKEN_SOURCE_LENGTH], SourceName, 0, 8, 1); TEST_FIELD(TOKEN_SOURCE, LUID, SourceIdentifier, 8, 8, 4); /* TOKEN_USER (pack 4) */ diff --git a/dlls/user/tests/generated.c b/dlls/user/tests/generated.c index 0b9b67fe5fe..4da11440136 100644 --- a/dlls/user/tests/generated.c +++ b/dlls/user/tests/generated.c @@ -5,15 +5,12 @@ * Unit tests for data structure packing */ -#include +#define WINVER 0x0501 +#define WINE_NOWINSOCK + +#include "windows.h" #include "wine/test.h" -#include "basetsd.h" -#include "winnt.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" /*********************************************************************** * Windows API extension @@ -236,8 +233,8 @@ void test_pack(void) /* HARDWAREHOOKSTRUCT (pack 4) */ TEST_TYPE(HARDWAREHOOKSTRUCT, 16, 4); - TEST_FIELD(HARDWAREHOOKSTRUCT, HWND, hWnd, 0, 4, 4); - TEST_FIELD(HARDWAREHOOKSTRUCT, UINT, wMessage, 4, 4, 4); + TEST_FIELD(HARDWAREHOOKSTRUCT, HWND, hwnd, 0, 4, 4); + TEST_FIELD(HARDWAREHOOKSTRUCT, UINT, message, 4, 4, 4); TEST_FIELD(HARDWAREHOOKSTRUCT, WPARAM, wParam, 8, 4, 4); TEST_FIELD(HARDWAREHOOKSTRUCT, LPARAM, lParam, 12, 4, 4); @@ -253,7 +250,7 @@ void test_pack(void) TEST_FIELD(HELPINFO, INT, iContextType, 4, 4, 4); TEST_FIELD(HELPINFO, INT, iCtrlId, 8, 4, 4); TEST_FIELD(HELPINFO, HANDLE, hItemHandle, 12, 4, 4); - TEST_FIELD(HELPINFO, DWORD, dwContextId, 16, 4, 4); + TEST_FIELD(HELPINFO, DWORD_PTR, dwContextId, 16, 4, 4); TEST_FIELD(HELPINFO, POINT, MousePos, 20, 8, 4); /* HELPWININFOA (pack 4) */ @@ -498,7 +495,7 @@ void test_pack(void) TEST_FIELD(MSGBOXPARAMSA, LPCSTR, lpszCaption, 16, 4, 4); TEST_FIELD(MSGBOXPARAMSA, DWORD, dwStyle, 20, 4, 4); TEST_FIELD(MSGBOXPARAMSA, LPCSTR, lpszIcon, 24, 4, 4); - TEST_FIELD(MSGBOXPARAMSA, DWORD, dwContextHelpId, 28, 4, 4); + TEST_FIELD(MSGBOXPARAMSA, DWORD_PTR, dwContextHelpId, 28, 4, 4); TEST_FIELD(MSGBOXPARAMSA, MSGBOXCALLBACK, lpfnMsgBoxCallback, 32, 4, 4); TEST_FIELD(MSGBOXPARAMSA, DWORD, dwLanguageId, 36, 4, 4); @@ -511,7 +508,7 @@ void test_pack(void) TEST_FIELD(MSGBOXPARAMSW, LPCWSTR, lpszCaption, 16, 4, 4); TEST_FIELD(MSGBOXPARAMSW, DWORD, dwStyle, 20, 4, 4); TEST_FIELD(MSGBOXPARAMSW, LPCWSTR, lpszIcon, 24, 4, 4); - TEST_FIELD(MSGBOXPARAMSW, DWORD, dwContextHelpId, 28, 4, 4); + TEST_FIELD(MSGBOXPARAMSW, DWORD_PTR, dwContextHelpId, 28, 4, 4); TEST_FIELD(MSGBOXPARAMSW, MSGBOXCALLBACK, lpfnMsgBoxCallback, 32, 4, 4); TEST_FIELD(MSGBOXPARAMSW, DWORD, dwLanguageId, 36, 4, 4); @@ -526,13 +523,13 @@ void test_pack(void) /* MULTIKEYHELPA (pack 4) */ TEST_TYPE(MULTIKEYHELPA, 8, 4); TEST_FIELD(MULTIKEYHELPA, DWORD, mkSize, 0, 4, 4); - TEST_FIELD(MULTIKEYHELPA, CHAR, mkKeyList, 4, 1, 1); + TEST_FIELD(MULTIKEYHELPA, CHAR, mkKeylist, 4, 1, 1); TEST_FIELD(MULTIKEYHELPA, CHAR[1], szKeyphrase, 5, 1, 1); /* MULTIKEYHELPW (pack 4) */ TEST_TYPE(MULTIKEYHELPW, 8, 4); TEST_FIELD(MULTIKEYHELPW, DWORD, mkSize, 0, 4, 4); - TEST_FIELD(MULTIKEYHELPW, WCHAR, mkKeyList, 4, 2, 2); + TEST_FIELD(MULTIKEYHELPW, WCHAR, mkKeylist, 4, 2, 2); TEST_FIELD(MULTIKEYHELPW, WCHAR[1], szKeyphrase, 6, 2, 2); /* NCCALCSIZE_PARAMS (pack 4) */