Remove types that don't exist from tests.dat.
Don't test types that have a platform dependent layout. Don't test Wine-only types. Helps get the generated tests compiling on Windows.
This commit is contained in:
parent
bf9f8da333
commit
68232c6c2f
|
@ -964,14 +964,6 @@ static void test_pack_STARTUPINFOW(void)
|
|||
TEST_FIELD(STARTUPINFOW, HANDLE, hStdError, 64, 4, 4);
|
||||
}
|
||||
|
||||
static void test_pack_SYSLEVEL(void)
|
||||
{
|
||||
/* 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);
|
||||
}
|
||||
|
||||
static void test_pack_SYSTEMTIME(void)
|
||||
{
|
||||
/* SYSTEMTIME (pack 4) */
|
||||
|
@ -1170,7 +1162,6 @@ static void test_pack(void)
|
|||
test_pack_SECURITY_ATTRIBUTES();
|
||||
test_pack_STARTUPINFOA();
|
||||
test_pack_STARTUPINFOW();
|
||||
test_pack_SYSLEVEL();
|
||||
test_pack_SYSTEMTIME();
|
||||
test_pack_SYSTEM_POWER_STATUS();
|
||||
test_pack_TIME_ZONE_INFORMATION();
|
||||
|
|
|
@ -349,37 +349,6 @@ static void test_pack_CHAR(void)
|
|||
TEST_TYPE_SIGNED(CHAR);
|
||||
}
|
||||
|
||||
static void test_pack_CONTEXT86(void)
|
||||
{
|
||||
/* 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);
|
||||
}
|
||||
|
||||
static void test_pack_DWORDLONG(void)
|
||||
{
|
||||
/* DWORDLONG */
|
||||
|
@ -1052,12 +1021,6 @@ static void test_pack_PCWSTR(void)
|
|||
TEST_TYPE_POINTER(PCWSTR, 2, 2);
|
||||
}
|
||||
|
||||
static void test_pack_PEXCEPTION_HANDLER(void)
|
||||
{
|
||||
/* PEXCEPTION_HANDLER */
|
||||
TEST_TYPE(PEXCEPTION_HANDLER, 4, 4);
|
||||
}
|
||||
|
||||
static void test_pack_PEXCEPTION_POINTERS(void)
|
||||
{
|
||||
/* PEXCEPTION_POINTERS */
|
||||
|
@ -2099,7 +2062,6 @@ static void test_pack(void)
|
|||
test_pack_CCHAR();
|
||||
test_pack_CHAR();
|
||||
test_pack_COLORREF();
|
||||
test_pack_CONTEXT86();
|
||||
test_pack_DWORD();
|
||||
test_pack_DWORD32();
|
||||
test_pack_DWORD64();
|
||||
|
@ -2195,7 +2157,6 @@ static void test_pack(void)
|
|||
test_pack_PCTSTR();
|
||||
test_pack_PCWCH();
|
||||
test_pack_PCWSTR();
|
||||
test_pack_PEXCEPTION_HANDLER();
|
||||
test_pack_PEXCEPTION_POINTERS();
|
||||
test_pack_PEXCEPTION_RECORD();
|
||||
test_pack_PFLOATING_SAVE_AREA();
|
||||
|
|
|
@ -399,12 +399,6 @@ static void test_pack_WORD_SIZEDARR(void)
|
|||
TEST_FIELD(WORD_SIZEDARR, unsigned short *, pData, 4, 4, 4);
|
||||
}
|
||||
|
||||
static void test_pack__VARIANT_BOOL(void)
|
||||
{
|
||||
/* _VARIANT_BOOL */
|
||||
TEST_TYPE(_VARIANT_BOOL, 2, 2);
|
||||
}
|
||||
|
||||
static void test_pack_remoteMETAFILEPICT(void)
|
||||
{
|
||||
/* remoteMETAFILEPICT (pack 4) */
|
||||
|
@ -415,15 +409,6 @@ static void test_pack_remoteMETAFILEPICT(void)
|
|||
TEST_FIELD(remoteMETAFILEPICT, userHMETAFILE *, hMF, 12, 4, 4);
|
||||
}
|
||||
|
||||
static void test_pack_rpcLOGPALETTE(void)
|
||||
{
|
||||
/* rpcLOGPALETTE (pack 4) */
|
||||
TEST_TYPE(rpcLOGPALETTE, 8, 2);
|
||||
TEST_FIELD(rpcLOGPALETTE, WORD, palVersion, 0, 2, 2);
|
||||
TEST_FIELD(rpcLOGPALETTE, WORD, palNumEntries, 2, 2, 2);
|
||||
TEST_FIELD(rpcLOGPALETTE, PALETTEENTRY[1], palPalEntry, 4, 4, 1);
|
||||
}
|
||||
|
||||
static void test_pack_userBITMAP(void)
|
||||
{
|
||||
/* userBITMAP (pack 4) */
|
||||
|
@ -1131,9 +1116,7 @@ static void test_pack(void)
|
|||
test_pack_VARIANT_BOOL();
|
||||
test_pack_VARTYPE();
|
||||
test_pack_WORD_SIZEDARR();
|
||||
test_pack__VARIANT_BOOL();
|
||||
test_pack_remoteMETAFILEPICT();
|
||||
test_pack_rpcLOGPALETTE();
|
||||
test_pack_userBITMAP();
|
||||
test_pack_userCLIPFORMAT();
|
||||
test_pack_userHBITMAP();
|
||||
|
|
|
@ -166,8 +166,6 @@ EnumICMProfilesProcCallbackA
|
|||
EnumICMProfilesProcCallbackW
|
||||
FIXED
|
||||
FONTENUMPROCA
|
||||
FONTENUMPROCEXA
|
||||
FONTENUMPROCEXW
|
||||
FONTENUMPROCW
|
||||
FONTSIGNATURE
|
||||
FXPT16DOT16
|
||||
|
@ -243,8 +241,6 @@ LPMETAFILEPICT
|
|||
LPMETAHEADER
|
||||
LPMETARECORD
|
||||
LPNEWTEXTMETRICA
|
||||
LPNEWTEXTMETRICEXA
|
||||
LPNEWTEXTMETRICEXW
|
||||
LPNEWTEXTMETRICW
|
||||
LPOUTLINETEXTMETRICA
|
||||
LPOUTLINETEXTMETRICW
|
||||
|
@ -412,7 +408,6 @@ PEMRSTROKEPATH
|
|||
PEMRTEXT
|
||||
PEMRWIDENPATH
|
||||
PENHMETAHEADER
|
||||
PERMSETICMMODE
|
||||
PEXTLOGFONTA
|
||||
PEXTLOGFONTW
|
||||
PEXTLOGPEN
|
||||
|
@ -600,7 +595,7 @@ RIP_INFO
|
|||
SECURITY_ATTRIBUTES
|
||||
STARTUPINFOA
|
||||
STARTUPINFOW
|
||||
SYSLEVEL
|
||||
!SYSLEVEL # Wine-only type
|
||||
SYSTEMTIME
|
||||
!SYSTEM_INFO
|
||||
SYSTEM_POWER_STATUS
|
||||
|
@ -647,8 +642,8 @@ CATCHBUF
|
|||
CCHAR
|
||||
CHAR
|
||||
COLORREF
|
||||
!CONTEXT
|
||||
CONTEXT86
|
||||
!CONTEXT # Architecture dependent layout
|
||||
!CONTEXT86 # Architecture dependent layout
|
||||
DATE
|
||||
DOUBLE
|
||||
DWORD
|
||||
|
@ -763,8 +758,7 @@ PCSTR
|
|||
PCTSTR
|
||||
PCWCH
|
||||
PCWSTR
|
||||
PEXCEPTION_FRAME
|
||||
PEXCEPTION_HANDLER
|
||||
!PEXCEPTION_HANDLER # Wine-only type
|
||||
PEXCEPTION_POINTERS
|
||||
PEXCEPTION_RECORD
|
||||
PFLOATING_SAVE_AREA
|
||||
|
@ -1056,9 +1050,9 @@ UP_FLAGGED_WORD_BLOB
|
|||
VARIANT_BOOL
|
||||
VARTYPE
|
||||
WORD_SIZEDARR
|
||||
_VARIANT_BOOL
|
||||
!_VARIANT_BOOL # Wine-only type (for all practical purposes)
|
||||
remoteMETAFILEPICT
|
||||
rpcLOGPALETTE
|
||||
!rpcLOGPALETTE # Removed in the latest Platform SDKs
|
||||
userBITMAP
|
||||
userCLIPFORMAT
|
||||
userHBITMAP
|
||||
|
@ -1519,56 +1513,43 @@ INTERNET_BUFFERSA
|
|||
INTERNET_BUFFERSW
|
||||
INTERNET_CACHE_ENTRY_INFOA
|
||||
INTERNET_CACHE_ENTRY_INFOW
|
||||
INTERNET_CERTIFICATE_INFO
|
||||
INTERNET_CERTIFICATE_INFOA
|
||||
INTERNET_CERTIFICATE_INFOW
|
||||
INTERNET_CONNECTED_INFO
|
||||
INTERNET_PORT
|
||||
INTERNET_PROXY_INFO
|
||||
INTERNET_PROXY_INFOA
|
||||
INTERNET_PROXY_INFOW
|
||||
INTERNET_STATUS_CALLBACK
|
||||
INTERNET_VERSION_INFO
|
||||
LPGOPHER_ABSTRACT_ATTRIBUTE_TYPE
|
||||
LPGOPHER_ABSTRACT_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_ABSTRACT_ATTRIBUTE_TYPEW
|
||||
LPGOPHER_ADMIN_ATTRIBUTE_TYPE
|
||||
LPGOPHER_ADMIN_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_ADMIN_ATTRIBUTE_TYPEW
|
||||
LPGOPHER_ASK_ATTRIBUTE_TYPE
|
||||
LPGOPHER_ASK_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_ASK_ATTRIBUTE_TYPEW
|
||||
LPGOPHER_ATTRIBUTE_TYPE
|
||||
LPGOPHER_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_ATTRIBUTE_TYPEW
|
||||
LPGOPHER_FIND_DATAA
|
||||
LPGOPHER_FIND_DATAW
|
||||
LPGOPHER_GEOGRAPHICAL_LOCATION_ATTRIBUTE_TYPE
|
||||
LPGOPHER_LOCATION_ATTRIBUTE_TYPE
|
||||
LPGOPHER_LOCATION_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_LOCATION_ATTRIBUTE_TYPEW
|
||||
LPGOPHER_MOD_DATE_ATTRIBUTE_TYPE
|
||||
LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPE
|
||||
LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPEW
|
||||
LPGOPHER_PROVIDER_ATTRIBUTE_TYPE
|
||||
LPGOPHER_PROVIDER_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_PROVIDER_ATTRIBUTE_TYPEW
|
||||
LPGOPHER_SCORE_ATTRIBUTE_TYPE
|
||||
LPGOPHER_SCORE_RANGE_ATTRIBUTE_TYPE
|
||||
LPGOPHER_SITE_ATTRIBUTE_TYPE
|
||||
LPGOPHER_SITE_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_SITE_ATTRIBUTE_TYPEW
|
||||
LPGOPHER_TIMEZONE_ATTRIBUTE_TYPE
|
||||
LPGOPHER_TTL_ATTRIBUTE_TYPE
|
||||
LPGOPHER_UNKNOWN_ATTRIBUTE_TYPE
|
||||
LPGOPHER_UNKNOWN_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_UNKNOWN_ATTRIBUTE_TYPEW
|
||||
LPGOPHER_VERONICA_ATTRIBUTE_TYPE
|
||||
LPGOPHER_VERSION_ATTRIBUTE_TYPE
|
||||
LPGOPHER_VERSION_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_VERSION_ATTRIBUTE_TYPEW
|
||||
LPGOPHER_VIEW_ATTRIBUTE_TYPE
|
||||
LPGOPHER_VIEW_ATTRIBUTE_TYPEA
|
||||
LPGOPHER_VIEW_ATTRIBUTE_TYPEW
|
||||
LPHINTERNET
|
||||
|
|
Loading…
Reference in New Issue