winapi_test: Regenerate tests.
Remove structs from test list which have preprocessor directives in
their definitions (winapi_test can't handle that).
diff --git a/dlls/gdi/tests/generated.c b/dlls/gdi/tests/generated.c
index 81df0a2..ec9e9fa 100644
--- a/dlls/gdi/tests/generated.c
+++ b/dlls/gdi/tests/generated.c
@@ -499,7 +499,7 @@
TEST_TYPE(EMRCREATEBRUSHINDIRECT, 24, 4);
TEST_FIELD(EMRCREATEBRUSHINDIRECT, EMR, emr, 0, 8, 4);
TEST_FIELD(EMRCREATEBRUSHINDIRECT, DWORD, ihBrush, 8, 4, 4);
- TEST_FIELD(EMRCREATEBRUSHINDIRECT, LOGBRUSH, lb, 12, 12, 4);
+ TEST_FIELD(EMRCREATEBRUSHINDIRECT, LOGBRUSH32, lb, 12, 12, 4);
}
static void test_pack_EMRCREATECOLORSPACE(void)
@@ -1586,7 +1586,7 @@
TEST_FIELD(EXTLOGPEN, DWORD, elpWidth, 4, 4, 4);
TEST_FIELD(EXTLOGPEN, UINT, elpBrushStyle, 8, 4, 4);
TEST_FIELD(EXTLOGPEN, COLORREF, elpColor, 12, 4, 4);
- TEST_FIELD(EXTLOGPEN, LONG, elpHatch, 16, 4, 4);
+ TEST_FIELD(EXTLOGPEN, ULONG_PTR, elpHatch, 16, 4, 4);
TEST_FIELD(EXTLOGPEN, DWORD, elpNumEntries, 20, 4, 4);
TEST_FIELD(EXTLOGPEN, DWORD[1], elpStyleEntry, 24, 4, 4);
}
@@ -1797,7 +1797,7 @@
TEST_TYPE(LOGBRUSH, 12, 4);
TEST_FIELD(LOGBRUSH, UINT, lbStyle, 0, 4, 4);
TEST_FIELD(LOGBRUSH, COLORREF, lbColor, 4, 4, 4);
- TEST_FIELD(LOGBRUSH, INT, lbHatch, 8, 4, 4);
+ TEST_FIELD(LOGBRUSH, ULONG_PTR, lbHatch, 8, 4, 4);
}
static void test_pack_LOGCOLORSPACEA(void)
diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c
index e7b1b5e..4777d29 100644
--- a/dlls/kernel32/tests/generated.c
+++ b/dlls/kernel32/tests/generated.c
@@ -435,7 +435,6 @@
static void test_pack_CRITICAL_SECTION_DEBUG(void)
{
/* CRITICAL_SECTION_DEBUG */
- TEST_TYPE(CRITICAL_SECTION_DEBUG, 32, 4);
}
static void test_pack_DCB(void)
@@ -671,7 +670,6 @@
{
/* LPOVERLAPPED */
TEST_TYPE(LPOVERLAPPED, 4, 4);
- TEST_TYPE_POINTER(LPOVERLAPPED, 20, 4);
}
static void test_pack_LPOVERLAPPED_COMPLETION_ROUTINE(void)
@@ -819,7 +817,7 @@
TEST_FIELD(OFSTRUCT, WORD, nErrCode, 2, 2, 2);
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);
+ TEST_FIELD(OFSTRUCT, CHAR[OFS_MAXPATHNAME], szPathName, 8, 128, 1);
}
static void test_pack_OUTPUT_DEBUG_STRING_INFO(void)
@@ -831,17 +829,6 @@
TEST_FIELD(OUTPUT_DEBUG_STRING_INFO, WORD, nDebugStringLength, 6, 2, 2);
}
-static void test_pack_OVERLAPPED(void)
-{
- /* OVERLAPPED (pack 4) */
- TEST_TYPE(OVERLAPPED, 20, 4);
- TEST_FIELD(OVERLAPPED, ULONG_PTR, Internal, 0, 4, 4);
- TEST_FIELD(OVERLAPPED, ULONG_PTR, InternalHigh, 4, 4, 4);
- /*TEST_FIELD(OVERLAPPED, DWORD, Offset, 8, 4, 4);*/
- /*TEST_FIELD(OVERLAPPED, DWORD, OffsetHigh, 12, 4, 4);*/
- TEST_FIELD(OVERLAPPED, HANDLE, hEvent, 16, 4, 4);
-}
-
static void test_pack_PACTCTXA(void)
{
/* PACTCTXA */
@@ -1293,7 +1280,6 @@
test_pack_OSVERSIONINFOEXW();
test_pack_OSVERSIONINFOW();
test_pack_OUTPUT_DEBUG_STRING_INFO();
- test_pack_OVERLAPPED();
test_pack_PACTCTXA();
test_pack_PACTCTXW();
test_pack_PACTCTX_SECTION_KEYED_DATA();
diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c
index 6ac1749..2e2b69b 100644
--- a/dlls/ntdll/tests/generated.c
+++ b/dlls/ntdll/tests/generated.c
@@ -635,48 +635,8 @@
static void test_pack_IMAGE_NT_HEADERS(void)
{
- /* IMAGE_NT_HEADERS (pack 4) */
+ /* IMAGE_NT_HEADERS */
TEST_TYPE(IMAGE_NT_HEADERS, 248, 4);
- TEST_FIELD(IMAGE_NT_HEADERS, DWORD, Signature, 0, 4, 4);
- TEST_FIELD(IMAGE_NT_HEADERS, IMAGE_FILE_HEADER, FileHeader, 4, 20, 4);
- TEST_FIELD(IMAGE_NT_HEADERS, IMAGE_OPTIONAL_HEADER, OptionalHeader, 24, 224, 4);
-}
-
-static void test_pack_IMAGE_OPTIONAL_HEADER(void)
-{
- /* IMAGE_OPTIONAL_HEADER (pack 4) */
- TEST_TYPE(IMAGE_OPTIONAL_HEADER, 224, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, WORD, Magic, 0, 2, 2);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, BYTE, MajorLinkerVersion, 2, 1, 1);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, BYTE, MinorLinkerVersion, 3, 1, 1);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, SizeOfCode, 4, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, SizeOfInitializedData, 8, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, SizeOfUninitializedData, 12, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, AddressOfEntryPoint, 16, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, BaseOfCode, 20, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, BaseOfData, 24, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, ImageBase, 28, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, SectionAlignment, 32, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, FileAlignment, 36, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, WORD, MajorOperatingSystemVersion, 40, 2, 2);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, WORD, MinorOperatingSystemVersion, 42, 2, 2);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, WORD, MajorImageVersion, 44, 2, 2);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, WORD, MinorImageVersion, 46, 2, 2);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, WORD, MajorSubsystemVersion, 48, 2, 2);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, WORD, MinorSubsystemVersion, 50, 2, 2);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, Win32VersionValue, 52, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, SizeOfImage, 56, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, SizeOfHeaders, 60, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, CheckSum, 64, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, WORD, Subsystem, 68, 2, 2);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, WORD, DllCharacteristics, 70, 2, 2);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, SizeOfStackReserve, 72, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, SizeOfStackCommit, 76, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, SizeOfHeapReserve, 80, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, SizeOfHeapCommit, 84, 4, 4);
- TEST_FIELD(IMAGE_OPTIONAL_HEADER, DWORD, LoaderFlags, 88, 4, 4);
- 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);
}
static void test_pack_IMAGE_OS2_HEADER(void)
@@ -795,19 +755,13 @@
static void test_pack_IMAGE_THUNK_DATA(void)
{
- /* IMAGE_THUNK_DATA (pack 4) */
+ /* IMAGE_THUNK_DATA */
}
static void test_pack_IMAGE_TLS_DIRECTORY(void)
{
- /* IMAGE_TLS_DIRECTORY (pack 4) */
+ /* IMAGE_TLS_DIRECTORY */
TEST_TYPE(IMAGE_TLS_DIRECTORY, 24, 4);
- TEST_FIELD(IMAGE_TLS_DIRECTORY, DWORD, StartAddressOfRawData, 0, 4, 4);
- TEST_FIELD(IMAGE_TLS_DIRECTORY, DWORD, EndAddressOfRawData, 4, 4, 4);
- TEST_FIELD(IMAGE_TLS_DIRECTORY, LPDWORD, AddressOfIndex, 8, 4, 4);
- TEST_FIELD(IMAGE_TLS_DIRECTORY, PIMAGE_TLS_CALLBACK *, AddressOfCallBacks, 12, 4, 4);
- TEST_FIELD(IMAGE_TLS_DIRECTORY, DWORD, SizeOfZeroFill, 16, 4, 4);
- TEST_FIELD(IMAGE_TLS_DIRECTORY, DWORD, Characteristics, 20, 4, 4);
}
static void test_pack_IMAGE_VXD_HEADER(void)
@@ -920,12 +874,6 @@
TEST_TYPE_SIGNED(LONGLONG);
}
-static void test_pack_LPTOP_LEVEL_EXCEPTION_FILTER(void)
-{
- /* LPTOP_LEVEL_EXCEPTION_FILTER */
- TEST_TYPE(LPTOP_LEVEL_EXCEPTION_FILTER, 4, 4);
-}
-
static void test_pack_LUID(void)
{
/* LUID (pack 4) */
@@ -949,7 +897,7 @@
TEST_FIELD(MEMORY_BASIC_INFORMATION, LPVOID, BaseAddress, 0, 4, 4);
TEST_FIELD(MEMORY_BASIC_INFORMATION, LPVOID, AllocationBase, 4, 4, 4);
TEST_FIELD(MEMORY_BASIC_INFORMATION, DWORD, AllocationProtect, 8, 4, 4);
- TEST_FIELD(MEMORY_BASIC_INFORMATION, DWORD, RegionSize, 12, 4, 4);
+ TEST_FIELD(MEMORY_BASIC_INFORMATION, SIZE_T, RegionSize, 12, 4, 4);
TEST_FIELD(MEMORY_BASIC_INFORMATION, DWORD, State, 16, 4, 4);
TEST_FIELD(MEMORY_BASIC_INFORMATION, DWORD, Protect, 20, 4, 4);
TEST_FIELD(MEMORY_BASIC_INFORMATION, DWORD, Type, 24, 4, 4);
@@ -1250,14 +1198,12 @@
{
/* PIMAGE_NT_HEADERS */
TEST_TYPE(PIMAGE_NT_HEADERS, 4, 4);
- TEST_TYPE_POINTER(PIMAGE_NT_HEADERS, 248, 4);
}
static void test_pack_PIMAGE_OPTIONAL_HEADER(void)
{
/* PIMAGE_OPTIONAL_HEADER */
TEST_TYPE(PIMAGE_OPTIONAL_HEADER, 4, 4);
- TEST_TYPE_POINTER(PIMAGE_OPTIONAL_HEADER, 224, 4);
}
static void test_pack_PIMAGE_OS2_HEADER(void)
@@ -1342,7 +1288,6 @@
{
/* PIMAGE_TLS_DIRECTORY */
TEST_TYPE(PIMAGE_TLS_DIRECTORY, 4, 4);
- TEST_TYPE_POINTER(PIMAGE_TLS_DIRECTORY, 24, 4);
}
static void test_pack_PIMAGE_VXD_HEADER(void)
@@ -1482,7 +1427,6 @@
{
/* PRTL_CRITICAL_SECTION_DEBUG */
TEST_TYPE(PRTL_CRITICAL_SECTION_DEBUG, 4, 4);
- TEST_TYPE_POINTER(PRTL_CRITICAL_SECTION_DEBUG, 32, 4);
}
static void test_pack_PRTL_OSVERSIONINFOEXW(void)
@@ -1503,7 +1447,6 @@
{
/* PRTL_RESOURCE_DEBUG */
TEST_TYPE(PRTL_RESOURCE_DEBUG, 4, 4);
- TEST_TYPE_POINTER(PRTL_RESOURCE_DEBUG, 32, 4);
}
static void test_pack_PSECURITY_DESCRIPTOR(void)
@@ -1580,12 +1523,6 @@
TEST_TYPE_POINTER(PTOKEN_USER, 8, 4);
}
-static void test_pack_PTOP_LEVEL_EXCEPTION_FILTER(void)
-{
- /* PTOP_LEVEL_EXCEPTION_FILTER */
- TEST_TYPE(PTOP_LEVEL_EXCEPTION_FILTER, 4, 4);
-}
-
static void test_pack_PTSTR(void)
{
/* PTSTR */
@@ -1639,14 +1576,12 @@
static void test_pack_RTL_CRITICAL_SECTION_DEBUG(void)
{
/* RTL_CRITICAL_SECTION_DEBUG (pack 4) */
- TEST_TYPE(RTL_CRITICAL_SECTION_DEBUG, 32, 4);
TEST_FIELD(RTL_CRITICAL_SECTION_DEBUG, WORD, Type, 0, 2, 2);
TEST_FIELD(RTL_CRITICAL_SECTION_DEBUG, WORD, CreatorBackTraceIndex, 2, 2, 2);
TEST_FIELD(RTL_CRITICAL_SECTION_DEBUG, struct _RTL_CRITICAL_SECTION *, CriticalSection, 4, 4, 4);
TEST_FIELD(RTL_CRITICAL_SECTION_DEBUG, LIST_ENTRY, ProcessLocksList, 8, 8, 4);
TEST_FIELD(RTL_CRITICAL_SECTION_DEBUG, DWORD, EntryCount, 16, 4, 4);
TEST_FIELD(RTL_CRITICAL_SECTION_DEBUG, DWORD, ContentionCount, 20, 4, 4);
- TEST_FIELD(RTL_CRITICAL_SECTION_DEBUG, DWORD[ 2 ], Spare, 24, 8, 4);
}
static void test_pack_RTL_OSVERSIONINFOEXW(void)
@@ -1681,14 +1616,12 @@
static void test_pack_RTL_RESOURCE_DEBUG(void)
{
/* RTL_RESOURCE_DEBUG (pack 4) */
- TEST_TYPE(RTL_RESOURCE_DEBUG, 32, 4);
TEST_FIELD(RTL_RESOURCE_DEBUG, WORD, Type, 0, 2, 2);
TEST_FIELD(RTL_RESOURCE_DEBUG, WORD, CreatorBackTraceIndex, 2, 2, 2);
TEST_FIELD(RTL_RESOURCE_DEBUG, struct _RTL_CRITICAL_SECTION *, CriticalSection, 4, 4, 4);
TEST_FIELD(RTL_RESOURCE_DEBUG, LIST_ENTRY, ProcessLocksList, 8, 8, 4);
TEST_FIELD(RTL_RESOURCE_DEBUG, DWORD, EntryCount, 16, 4, 4);
TEST_FIELD(RTL_RESOURCE_DEBUG, DWORD, ContentionCount, 20, 4, 4);
- TEST_FIELD(RTL_RESOURCE_DEBUG, DWORD[ 2 ], Spare, 24, 8, 4);
}
static void test_pack_SECURITY_CONTEXT_TRACKING_MODE(void)
@@ -2029,13 +1962,6 @@
TEST_TYPE_POINTER(LPPOINT, 8, 4);
}
-static void test_pack_LPPOINTS(void)
-{
- /* LPPOINTS */
- TEST_TYPE(LPPOINTS, 4, 4);
- TEST_TYPE_POINTER(LPPOINTS, 4, 2);
-}
-
static void test_pack_LPRECT(void)
{
/* LPRECT */
@@ -2079,14 +2005,6 @@
TEST_FIELD(POINTL, LONG, y, 4, 4, 4);
}
-static void test_pack_POINTS(void)
-{
- /* POINTS (pack 4) */
- TEST_TYPE(POINTS, 4, 2);
- TEST_FIELD(POINTS, SHORT, x, 0, 2, 2);
- TEST_FIELD(POINTS, SHORT, y, 2, 2, 2);
-}
-
static void test_pack_PPOINT(void)
{
/* PPOINT */
@@ -2101,13 +2019,6 @@
TEST_TYPE_POINTER(PPOINTL, 8, 4);
}
-static void test_pack_PPOINTS(void)
-{
- /* PPOINTS */
- TEST_TYPE(PPOINTS, 4, 4);
- TEST_TYPE_POINTER(PPOINTS, 4, 2);
-}
-
static void test_pack_PRECT(void)
{
/* PRECT */
@@ -2273,7 +2184,6 @@
test_pack_IMAGE_LINENUMBER();
test_pack_IMAGE_LOAD_CONFIG_DIRECTORY();
test_pack_IMAGE_NT_HEADERS();
- test_pack_IMAGE_OPTIONAL_HEADER();
test_pack_IMAGE_OS2_HEADER();
test_pack_IMAGE_RELOCATION();
test_pack_IMAGE_RESOURCE_DATA_ENTRY();
@@ -2309,11 +2219,9 @@
test_pack_LPCRECTL();
test_pack_LPCVOID();
test_pack_LPPOINT();
- test_pack_LPPOINTS();
test_pack_LPRECT();
test_pack_LPRECTL();
test_pack_LPSIZE();
- test_pack_LPTOP_LEVEL_EXCEPTION_FILTER();
test_pack_LRESULT();
test_pack_LUID();
test_pack_LUID_AND_ATTRIBUTES();
@@ -2391,10 +2299,8 @@
test_pack_POBJECT_TYPE_LIST();
test_pack_POINT();
test_pack_POINTL();
- test_pack_POINTS();
test_pack_PPOINT();
test_pack_PPOINTL();
- test_pack_PPOINTS();
test_pack_PPRIVILEGE_SET();
test_pack_PRECT();
test_pack_PRECTL();
@@ -2419,7 +2325,6 @@
test_pack_PTOKEN_GROUPS();
test_pack_PTOKEN_PRIVILEGES();
test_pack_PTOKEN_USER();
- test_pack_PTOP_LEVEL_EXCEPTION_FILTER();
test_pack_PTSTR();
test_pack_PULARGE_INTEGER();
test_pack_PVECTORED_EXCEPTION_HANDLER();
diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c
index ef4c5f4..fb7d7cc 100644
--- a/dlls/rpcrt4/tests/generated.c
+++ b/dlls/rpcrt4/tests/generated.c
@@ -355,12 +355,14 @@
static void test_pack_GENERIC_BINDING_INFO(void)
{
- /* GENERIC_BINDING_INFO */
+ /* GENERIC_BINDING_INFO (pack 4) */
+ TEST_FIELD(GENERIC_BINDING_INFO, void *, pObj, 0, 4, 4);
+ TEST_FIELD(GENERIC_BINDING_INFO, unsigned int, Size, 4, 4, 4);
}
static void test_pack_GENERIC_BINDING_ROUTINE_PAIR(void)
{
- /* GENERIC_BINDING_ROUTINE_PAIR */
+ /* GENERIC_BINDING_ROUTINE_PAIR (pack 4) */
}
static void test_pack_MALLOC_FREE_STRUCT(void)
@@ -488,6 +490,18 @@
TEST_TYPE(PFULL_PTR_XLAT_TABLES, 4, 4);
}
+static void test_pack_PGENERIC_BINDING_INFO(void)
+{
+ /* PGENERIC_BINDING_INFO */
+ TEST_TYPE(PGENERIC_BINDING_INFO, 4, 4);
+}
+
+static void test_pack_PGENERIC_BINDING_ROUTINE_PAIR(void)
+{
+ /* PGENERIC_BINDING_ROUTINE_PAIR */
+ TEST_TYPE(PGENERIC_BINDING_ROUTINE_PAIR, 4, 4);
+}
+
static void test_pack_PMIDL_SERVER_INFO(void)
{
/* PMIDL_SERVER_INFO */
@@ -563,6 +577,15 @@
/* STUB_THUNK */
}
+static void test_pack_USER_MARSHAL_CB(void)
+{
+ /* USER_MARSHAL_CB (pack 4) */
+ TEST_FIELD(USER_MARSHAL_CB, unsigned long, Flags, 0, 4, 4);
+ TEST_FIELD(USER_MARSHAL_CB, PMIDL_STUB_MESSAGE, pStubMsg, 4, 4, 4);
+ TEST_FIELD(USER_MARSHAL_CB, PFORMAT_STRING, pReserve, 8, 4, 4);
+ TEST_FIELD(USER_MARSHAL_CB, unsigned long, Signature, 12, 4, 4);
+}
+
static void test_pack_USER_MARSHAL_FREEING_ROUTINE(void)
{
/* USER_MARSHAL_FREEING_ROUTINE */
@@ -630,6 +653,8 @@
test_pack_PFORMAT_STRING();
test_pack_PFULL_PTR_TO_REFID_ELEMENT();
test_pack_PFULL_PTR_XLAT_TABLES();
+ test_pack_PGENERIC_BINDING_INFO();
+ test_pack_PGENERIC_BINDING_ROUTINE_PAIR();
test_pack_PMIDL_SERVER_INFO();
test_pack_PMIDL_STUBLESS_PROXY_INFO();
test_pack_PMIDL_STUB_DESC();
@@ -667,6 +692,7 @@
test_pack_SCONTEXT_QUEUE();
test_pack_SERVER_ROUTINE();
test_pack_STUB_THUNK();
+ test_pack_USER_MARSHAL_CB();
test_pack_USER_MARSHAL_FREEING_ROUTINE();
test_pack_USER_MARSHAL_MARSHALLING_ROUTINE();
test_pack_USER_MARSHAL_ROUTINE_QUADRUPLE();
diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c
index dee7638..b424065 100644
--- a/dlls/shell32/tests/generated.c
+++ b/dlls/shell32/tests/generated.c
@@ -201,14 +201,16 @@
TEST_FIELD(COAUTHINFO, DWORD, dwCapabilities, 24, 4, 4);
}
-static void test_pack_COSERVERINFO(void)
+static void test_pack_DATE(void)
{
- /* COSERVERINFO (pack 4) */
- TEST_TYPE(COSERVERINFO, 16, 4);
- TEST_FIELD(COSERVERINFO, DWORD, dwReserved1, 0, 4, 4);
- TEST_FIELD(COSERVERINFO, LPWSTR, pwszName, 4, 4, 4);
- TEST_FIELD(COSERVERINFO, COAUTHINFO *, pAuthInfo, 8, 4, 4);
- TEST_FIELD(COSERVERINFO, DWORD, dwReserved2, 12, 4, 4);
+ /* DATE */
+ TEST_TYPE(DATE, 8, 8);
+}
+
+static void test_pack_DOUBLE(void)
+{
+ /* DOUBLE */
+ TEST_TYPE(DOUBLE, 8, 8);
}
static void test_pack_DWORD_SIZEDARR(void)
@@ -255,7 +257,6 @@
{
/* LPBLOB */
TEST_TYPE(LPBLOB, 4, 4);
- TEST_TYPE_POINTER(LPBLOB, 8, 4);
}
static void test_pack_LPBSTR(void)
@@ -269,7 +270,6 @@
{
/* LPBSTRBLOB */
TEST_TYPE(LPBSTRBLOB, 4, 4);
- TEST_TYPE_POINTER(LPBSTRBLOB, 8, 4);
}
static void test_pack_LPCOLESTR(void)
@@ -835,7 +835,6 @@
{
/* LPITEMIDLIST */
TEST_TYPE(LPITEMIDLIST, 4, 4);
- TEST_TYPE_POINTER(LPITEMIDLIST, 3, 1);
}
static void test_pack_LPSHELLDETAILS(void)
@@ -848,7 +847,6 @@
{
/* LPSHITEMID */
TEST_TYPE(LPSHITEMID, 4, 4);
- TEST_TYPE_POINTER(LPSHITEMID, 3, 1);
}
static void test_pack_LPSTRRET(void)
@@ -1011,26 +1009,6 @@
TEST_FIELD(FILEGROUPDESCRIPTORW, FILEDESCRIPTORW[1], fgd, 4, 592, 1);
}
-static void test_pack_IFileSystemBindData(void)
-{
- /* IFileSystemBindData */
-}
-
-static void test_pack_IFileSystemBindDataVtbl(void)
-{
- /* IFileSystemBindDataVtbl */
-}
-
-static void test_pack_IShellChangeNotify(void)
-{
- /* IShellChangeNotify */
-}
-
-static void test_pack_IShellIcon(void)
-{
- /* IShellIcon */
-}
-
static void test_pack_LPBROWSEINFOA(void)
{
/* LPBROWSEINFOA */
@@ -1282,8 +1260,9 @@
test_pack_CLSID();
test_pack_COAUTHIDENTITY();
test_pack_COAUTHINFO();
- test_pack_COSERVERINFO();
test_pack_CSFV();
+ test_pack_DATE();
+ test_pack_DOUBLE();
test_pack_DRAGINFOA();
test_pack_DRAGINFOW();
test_pack_DROPFILES();
@@ -1299,11 +1278,7 @@
test_pack_GUID();
test_pack_HMETAFILEPICT();
test_pack_HYPER_SIZEDARR();
- test_pack_IFileSystemBindData();
- test_pack_IFileSystemBindDataVtbl();
test_pack_IID();
- test_pack_IShellChangeNotify();
- test_pack_IShellIcon();
test_pack_ITEMIDLIST();
test_pack_LPBLOB();
test_pack_LPBROWSEINFOA();
diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c
index b1f618b..d1bfa4c 100644
--- a/dlls/shlwapi/tests/generated.c
+++ b/dlls/shlwapi/tests/generated.c
@@ -157,11 +157,6 @@
TEST_TYPE(HUSKEY, 4, 4);
}
-static void test_pack_IQueryAssociations(void)
-{
- /* IQueryAssociations */
-}
-
static void test_pack_PHUSKEY(void)
{
/* PHUSKEY */
@@ -176,7 +171,6 @@
test_pack_DLLVERSIONINFO();
test_pack_DLLVERSIONINFO2();
test_pack_HUSKEY();
- test_pack_IQueryAssociations();
test_pack_PHUSKEY();
}
diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c
index 5bd1947..99bec81 100644
--- a/dlls/urlmon/tests/generated.c
+++ b/dlls/urlmon/tests/generated.c
@@ -130,7 +130,7 @@
static void test_pack_IBindHostVtbl(void)
{
- /* IBindHostVtbl */
+ /* IBindHostVtbl (pack 4) */
}
static void test_pack_IBindStatusCallback(void)
@@ -140,7 +140,7 @@
static void test_pack_IBindStatusCallbackVtbl(void)
{
- /* IBindStatusCallbackVtbl */
+ /* IBindStatusCallbackVtbl (pack 4) */
}
static void test_pack_IBinding(void)
@@ -150,7 +150,7 @@
static void test_pack_IBindingVtbl(void)
{
- /* IBindingVtbl */
+ /* IBindingVtbl (pack 4) */
}
static void test_pack_IInternetProtocolInfo(void)
@@ -160,7 +160,7 @@
static void test_pack_IInternetProtocolInfoVtbl(void)
{
- /* IInternetProtocolInfoVtbl */
+ /* IInternetProtocolInfoVtbl (pack 4) */
}
static void test_pack_IInternetSession(void)
@@ -170,7 +170,7 @@
static void test_pack_IInternetSessionVtbl(void)
{
- /* IInternetSessionVtbl */
+ /* IInternetSessionVtbl (pack 4) */
}
static void test_pack_IPersistMoniker(void)
@@ -180,7 +180,7 @@
static void test_pack_IPersistMonikerVtbl(void)
{
- /* IPersistMonikerVtbl */
+ /* IPersistMonikerVtbl (pack 4) */
}
static void test_pack_IWinInetHttpInfo(void)
@@ -190,7 +190,7 @@
static void test_pack_IWinInetHttpInfoVtbl(void)
{
- /* IWinInetHttpInfoVtbl */
+ /* IWinInetHttpInfoVtbl (pack 4) */
}
static void test_pack_IWinInetInfo(void)
@@ -200,7 +200,7 @@
static void test_pack_IWinInetInfoVtbl(void)
{
- /* IWinInetInfoVtbl */
+ /* IWinInetInfoVtbl (pack 4) */
}
static void test_pack_LPBINDHOST(void)
@@ -243,14 +243,12 @@
{
/* LPREMFORMATETC */
TEST_TYPE(LPREMFORMATETC, 4, 4);
- TEST_TYPE_POINTER(LPREMFORMATETC, 20, 4);
}
static void test_pack_LPREMSECURITY_ATTRIBUTES(void)
{
/* LPREMSECURITY_ATTRIBUTES */
TEST_TYPE(LPREMSECURITY_ATTRIBUTES, 4, 4);
- TEST_TYPE_POINTER(LPREMSECURITY_ATTRIBUTES, 12, 4);
}
static void test_pack_LPWININETHTTPINFO(void)
@@ -269,7 +267,6 @@
{
/* PREMSECURITY_ATTRIBUTES */
TEST_TYPE(PREMSECURITY_ATTRIBUTES, 4, 4);
- TEST_TYPE_POINTER(PREMSECURITY_ATTRIBUTES, 12, 4);
}
static void test_pack_REMSECURITY_ATTRIBUTES(void)
diff --git a/dlls/user/tests/generated.c b/dlls/user/tests/generated.c
index 5316926..f0012cf 100644
--- a/dlls/user/tests/generated.c
+++ b/dlls/user/tests/generated.c
@@ -113,15 +113,6 @@
#define TEST_TYPE_UNSIGNED(type) \
ok((type) -1 > 0, "(" #type ") -1 > 0\n");
-static void test_pack_ACCEL(void)
-{
- /* ACCEL (pack 4) */
- TEST_TYPE(ACCEL, 6, 2);
- TEST_FIELD(ACCEL, BYTE, fVirt, 0, 1, 1);
- TEST_FIELD(ACCEL, WORD, key, 2, 2, 2);
- TEST_FIELD(ACCEL, WORD, cmd, 4, 2, 2);
-}
-
static void test_pack_ACCESSTIMEOUT(void)
{
/* ACCESSTIMEOUT (pack 4) */
@@ -593,13 +584,6 @@
TEST_FIELD(KEYBDINPUT, ULONG_PTR, dwExtraInfo, 12, 4, 4);
}
-static void test_pack_LPACCEL(void)
-{
- /* LPACCEL */
- TEST_TYPE(LPACCEL, 4, 4);
- TEST_TYPE_POINTER(LPACCEL, 6, 2);
-}
-
static void test_pack_LPACCESSTIMEOUT(void)
{
/* LPACCESSTIMEOUT */
@@ -2243,7 +2227,6 @@
static void test_pack(void)
{
- test_pack_ACCEL();
test_pack_ACCESSTIMEOUT();
test_pack_ANIMATIONINFO();
test_pack_CBTACTIVATESTRUCT();
@@ -2291,7 +2274,6 @@
test_pack_INPUT();
test_pack_KBDLLHOOKSTRUCT();
test_pack_KEYBDINPUT();
- test_pack_LPACCEL();
test_pack_LPACCESSTIMEOUT();
test_pack_LPANIMATIONINFO();
test_pack_LPCBTACTIVATESTRUCT();
diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat
index 016e95c..a72eca3 100644
--- a/tools/winapi/tests.dat
+++ b/tools/winapi/tests.dat
@@ -459,7 +459,7 @@
TTPOLYGONHEADER
XFORM
-%%%dlls/kernel/tests
+%%%dlls/kernel32/tests
%%pack
@@ -562,7 +562,7 @@
OSVERSIONINFOEXW
OSVERSIONINFOW
OUTPUT_DEBUG_STRING_INFO
-OVERLAPPED
+!OVERLAPPED # Definition contains preprocessor directives
PACTCTXA
PACTCTXW
PACTCTX_SECTION_KEYED_DATA
@@ -730,7 +730,7 @@
LPCRECTL
LPCVOID
LPPOINT
-LPPOINTS
+!LPPOINTS # Definition contains preprocessor directives
LPRECT
LPRECTL
LPSIZE
@@ -814,10 +814,10 @@
POBJECT_TYPE_LIST
POINT
POINTL
-POINTS
+!POINTS # Definition contains preprocessor directives
PPOINT
PPOINTL
-PPOINTS
+!PPOINTS # Definition contains preprocessor directives
PPRIVILEGE_SET
PRECT
PRECTL
@@ -1317,7 +1317,7 @@
%type
-ACCEL
+!ACCEL # Definition contains preprocessor directives
ACCESSTIMEOUT
ANIMATIONINFO
CBTACTIVATESTRUCT
@@ -1365,7 +1365,7 @@
INPUT
KBDLLHOOKSTRUCT
KEYBDINPUT
-LPACCEL
+!LPACCEL # Definition contains preprocessor directives
LPACCESSTIMEOUT
LPANIMATIONINFO
LPCBTACTIVATESTRUCT
diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test
index db95c36..b1bb582 100755
--- a/tools/winapi/winapi_test
+++ b/tools/winapi/winapi_test
@@ -266,6 +266,10 @@
$align = 8;
$kind = "union";
$size = 8;
+ } elsif (/^(?:POINTS)$/) {
+ $align = 2;
+ $kind = "struct";
+ $size = 4;
} elsif (/^(struct|union)$/) {
$kind = $1;
if (!$size_parse_reported{$_}) {
