Commit ab974c31 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard

Updated the generated tests.

parent 3007bd43
......@@ -5,13 +5,12 @@
* Unit tests for data structure packing
*/
#include <stdio.h>
#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);
......
......@@ -5,13 +5,12 @@
* Unit tests for data structure packing
*/
#include <stdio.h>
#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);
......
......@@ -5,15 +5,12 @@
* Unit tests for data structure packing
*/
#include <stdio.h>
#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) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment