Updated the generated tests.

dlls/kernel/tests/generated.c

@@ -108,7 +108,7 @@
 #define TEST_TYPE_UNSIGNED(type) \
      ok((type) -1 > 0, "(" #type ") -1 > 0");
 
-void test_pack(void)
+static void test_pack_BY_HANDLE_FILE_INFORMATION(void)
 {
     /* BY_HANDLE_FILE_INFORMATION (pack 4) */
     TEST_TYPE(BY_HANDLE_FILE_INFORMATION, 52, 4);
@@ -122,12 +122,18 @@ void test_pack(void)
     TEST_FIELD(BY_HANDLE_FILE_INFORMATION, DWORD, nNumberOfLinks, 40, 4, 4);
     TEST_FIELD(BY_HANDLE_FILE_INFORMATION, DWORD, nFileIndexHigh, 44, 4, 4);
     TEST_FIELD(BY_HANDLE_FILE_INFORMATION, DWORD, nFileIndexLow, 48, 4, 4);
+}
 
+static void test_pack_COMMCONFIG(void)
+{
     /* COMMCONFIG (pack 4) */
     TEST_FIELD(COMMCONFIG, DWORD, dwSize, 0, 4, 4);
     TEST_FIELD(COMMCONFIG, WORD, wVersion, 4, 2, 2);
     TEST_FIELD(COMMCONFIG, WORD, wReserved, 6, 2, 2);
+}
 
+static void test_pack_COMMPROP(void)
+{
     /* COMMPROP (pack 4) */
     TEST_TYPE(COMMPROP, 64, 4);
     TEST_FIELD(COMMPROP, WORD, wPacketLength, 0, 2, 2);
@@ -148,7 +154,10 @@ void test_pack(void)
     TEST_FIELD(COMMPROP, DWORD, dwProvSpec1, 52, 4, 4);
     TEST_FIELD(COMMPROP, DWORD, dwProvSpec2, 56, 4, 4);
     TEST_FIELD(COMMPROP, WCHAR[1], wcProvChar, 60, 2, 2);
+}
 
+static void test_pack_COMMTIMEOUTS(void)
+{
     /* COMMTIMEOUTS (pack 4) */
     TEST_TYPE(COMMTIMEOUTS, 20, 4);
     TEST_FIELD(COMMTIMEOUTS, DWORD, ReadIntervalTimeout, 0, 4, 4);
@@ -156,12 +165,18 @@ void test_pack(void)
     TEST_FIELD(COMMTIMEOUTS, DWORD, ReadTotalTimeoutConstant, 8, 4, 4);
     TEST_FIELD(COMMTIMEOUTS, DWORD, WriteTotalTimeoutMultiplier, 12, 4, 4);
     TEST_FIELD(COMMTIMEOUTS, DWORD, WriteTotalTimeoutConstant, 16, 4, 4);
+}
 
+static void test_pack_COMSTAT(void)
+{
     /* COMSTAT (pack 4) */
     TEST_TYPE(COMSTAT, 12, 4);
     TEST_FIELD(COMSTAT, DWORD, cbInQue, 4, 4, 4);
     TEST_FIELD(COMSTAT, DWORD, cbOutQue, 8, 4, 4);
+}
 
+static void test_pack_CREATE_PROCESS_DEBUG_INFO(void)
+{
     /* CREATE_PROCESS_DEBUG_INFO (pack 4) */
     TEST_TYPE(CREATE_PROCESS_DEBUG_INFO, 40, 4);
     TEST_FIELD(CREATE_PROCESS_DEBUG_INFO, HANDLE, hFile, 0, 4, 4);
@@ -174,63 +189,93 @@ void test_pack(void)
     TEST_FIELD(CREATE_PROCESS_DEBUG_INFO, LPTHREAD_START_ROUTINE, lpStartAddress, 28, 4, 4);
     TEST_FIELD(CREATE_PROCESS_DEBUG_INFO, LPVOID, lpImageName, 32, 4, 4);
     TEST_FIELD(CREATE_PROCESS_DEBUG_INFO, WORD, fUnicode, 36, 2, 2);
+}
 
+static void test_pack_CREATE_THREAD_DEBUG_INFO(void)
+{
     /* CREATE_THREAD_DEBUG_INFO (pack 4) */
     TEST_TYPE(CREATE_THREAD_DEBUG_INFO, 12, 4);
     TEST_FIELD(CREATE_THREAD_DEBUG_INFO, HANDLE, hThread, 0, 4, 4);
     TEST_FIELD(CREATE_THREAD_DEBUG_INFO, LPVOID, lpThreadLocalBase, 4, 4, 4);
     TEST_FIELD(CREATE_THREAD_DEBUG_INFO, LPTHREAD_START_ROUTINE, lpStartAddress, 8, 4, 4);
+}
 
+static void test_pack_CRITICAL_SECTION(void)
+{
     /* CRITICAL_SECTION */
     TEST_TYPE(CRITICAL_SECTION, 24, 4);
+}
 
+static void test_pack_CRITICAL_SECTION_DEBUG(void)
+{
     /* CRITICAL_SECTION_DEBUG */
     TEST_TYPE(CRITICAL_SECTION_DEBUG, 32, 4);
+}
 
+static void test_pack_DCB(void)
+{
     /* DCB (pack 4) */
     TEST_FIELD(DCB, DWORD, DCBlength, 0, 4, 4);
     TEST_FIELD(DCB, DWORD, BaudRate, 4, 4, 4);
+}
 
+static void test_pack_DEBUG_EVENT(void)
+{
     /* DEBUG_EVENT (pack 4) */
     TEST_FIELD(DEBUG_EVENT, DWORD, dwDebugEventCode, 0, 4, 4);
     TEST_FIELD(DEBUG_EVENT, DWORD, dwProcessId, 4, 4, 4);
     TEST_FIELD(DEBUG_EVENT, DWORD, dwThreadId, 8, 4, 4);
+}
 
-    /* ENUMRESLANGPROCA */
+static void test_pack_EXCEPTION_DEBUG_INFO(void)
-
+{
-    /* ENUMRESLANGPROCW */
-
-    /* ENUMRESNAMEPROCA */
-
-    /* ENUMRESNAMEPROCW */
-
-    /* ENUMRESTYPEPROCA */
-
-    /* ENUMRESTYPEPROCW */
-
     /* EXCEPTION_DEBUG_INFO (pack 4) */
     TEST_TYPE(EXCEPTION_DEBUG_INFO, 84, 4);
     TEST_FIELD(EXCEPTION_DEBUG_INFO, EXCEPTION_RECORD, ExceptionRecord, 0, 80, 4);
     TEST_FIELD(EXCEPTION_DEBUG_INFO, DWORD, dwFirstChance, 80, 4, 4);
+}
 
+static void test_pack_EXIT_PROCESS_DEBUG_INFO(void)
+{
     /* EXIT_PROCESS_DEBUG_INFO (pack 4) */
     TEST_TYPE(EXIT_PROCESS_DEBUG_INFO, 4, 4);
     TEST_FIELD(EXIT_PROCESS_DEBUG_INFO, DWORD, dwExitCode, 0, 4, 4);
+}
 
+static void test_pack_EXIT_THREAD_DEBUG_INFO(void)
+{
     /* EXIT_THREAD_DEBUG_INFO (pack 4) */
     TEST_TYPE(EXIT_THREAD_DEBUG_INFO, 4, 4);
     TEST_FIELD(EXIT_THREAD_DEBUG_INFO, DWORD, dwExitCode, 0, 4, 4);
+}
 
+static void test_pack_HW_PROFILE_INFOA(void)
+{
     /* HW_PROFILE_INFOA (pack 4) */
     TEST_TYPE(HW_PROFILE_INFOA, 124, 4);
     TEST_FIELD(HW_PROFILE_INFOA, DWORD, dwDockInfo, 0, 4, 4);
     TEST_FIELD(HW_PROFILE_INFOA, CHAR[HW_PROFILE_GUIDLEN], szHwProfileGuid, 4, 39, 1);
     TEST_FIELD(HW_PROFILE_INFOA, CHAR[MAX_PROFILE_LEN], szHwProfileName, 43, 80, 1);
+}
 
+static void test_pack_HW_PROFILE_INFOW(void)
+{
+    /* HW_PROFILE_INFOW (pack 4) */
+    TEST_TYPE(HW_PROFILE_INFOW, 244, 4);
+    TEST_FIELD(HW_PROFILE_INFOW, DWORD, dwDockInfo, 0, 4, 4);
+    TEST_FIELD(HW_PROFILE_INFOW, WCHAR[HW_PROFILE_GUIDLEN], szHwProfileGuid, 4, 78, 2);
+    TEST_FIELD(HW_PROFILE_INFOW, WCHAR[MAX_PROFILE_LEN], szHwProfileName, 82, 160, 2);
+}
+
+static void test_pack_LDT_ENTRY(void)
+{
     /* LDT_ENTRY (pack 4) */
     TEST_FIELD(LDT_ENTRY, WORD, LimitLow, 0, 2, 2);
     TEST_FIELD(LDT_ENTRY, WORD, BaseLow, 2, 2, 2);
+}
 
+static void test_pack_LOAD_DLL_DEBUG_INFO(void)
+{
     /* LOAD_DLL_DEBUG_INFO (pack 4) */
     TEST_TYPE(LOAD_DLL_DEBUG_INFO, 24, 4);
     TEST_FIELD(LOAD_DLL_DEBUG_INFO, HANDLE, hFile, 0, 4, 4);
@@ -239,142 +284,265 @@ void test_pack(void)
     TEST_FIELD(LOAD_DLL_DEBUG_INFO, DWORD, nDebugInfoSize, 12, 4, 4);
     TEST_FIELD(LOAD_DLL_DEBUG_INFO, LPVOID, lpImageName, 16, 4, 4);
     TEST_FIELD(LOAD_DLL_DEBUG_INFO, WORD, fUnicode, 20, 2, 2);
+}
 
+static void test_pack_LPBY_HANDLE_FILE_INFORMATION(void)
+{
     /* LPBY_HANDLE_FILE_INFORMATION */
     TEST_TYPE(LPBY_HANDLE_FILE_INFORMATION, 4, 4);
     TEST_TYPE_POINTER(LPBY_HANDLE_FILE_INFORMATION, 52, 4);
+}
 
+static void test_pack_LPCOMMCONFIG(void)
+{
     /* LPCOMMCONFIG */
     TEST_TYPE(LPCOMMCONFIG, 4, 4);
+}
 
+static void test_pack_LPCOMMPROP(void)
+{
     /* LPCOMMPROP */
     TEST_TYPE(LPCOMMPROP, 4, 4);
     TEST_TYPE_POINTER(LPCOMMPROP, 64, 4);
+}
 
+static void test_pack_LPCOMMTIMEOUTS(void)
+{
     /* LPCOMMTIMEOUTS */
     TEST_TYPE(LPCOMMTIMEOUTS, 4, 4);
     TEST_TYPE_POINTER(LPCOMMTIMEOUTS, 20, 4);
+}
 
+static void test_pack_LPCOMSTAT(void)
+{
     /* LPCOMSTAT */
     TEST_TYPE(LPCOMSTAT, 4, 4);
     TEST_TYPE_POINTER(LPCOMSTAT, 12, 4);
+}
 
+static void test_pack_LPCONTEXT(void)
+{
     /* LPCONTEXT */
     TEST_TYPE(LPCONTEXT, 4, 4);
+}
 
+static void test_pack_LPCRITICAL_SECTION(void)
+{
     /* LPCRITICAL_SECTION */
     TEST_TYPE(LPCRITICAL_SECTION, 4, 4);
+}
 
+static void test_pack_LPCRITICAL_SECTION_DEBUG(void)
+{
     /* LPCRITICAL_SECTION_DEBUG */
     TEST_TYPE(LPCRITICAL_SECTION_DEBUG, 4, 4);
+}
 
+static void test_pack_LPDCB(void)
+{
     /* LPDCB */
     TEST_TYPE(LPDCB, 4, 4);
+}
 
+static void test_pack_LPDEBUG_EVENT(void)
+{
     /* LPDEBUG_EVENT */
     TEST_TYPE(LPDEBUG_EVENT, 4, 4);
+}
 
+static void test_pack_LPEXCEPTION_POINTERS(void)
+{
     /* LPEXCEPTION_POINTERS */
     TEST_TYPE(LPEXCEPTION_POINTERS, 4, 4);
+}
 
+static void test_pack_LPEXCEPTION_RECORD(void)
+{
     /* LPEXCEPTION_RECORD */
     TEST_TYPE(LPEXCEPTION_RECORD, 4, 4);
+}
 
+static void test_pack_LPFIBER_START_ROUTINE(void)
+{
     /* LPFIBER_START_ROUTINE */
+    TEST_TYPE(LPFIBER_START_ROUTINE, 4, 4);
+}
 
+static void test_pack_LPHW_PROFILE_INFOA(void)
+{
     /* LPHW_PROFILE_INFOA */
     TEST_TYPE(LPHW_PROFILE_INFOA, 4, 4);
     TEST_TYPE_POINTER(LPHW_PROFILE_INFOA, 124, 4);
+}
 
+static void test_pack_LPHW_PROFILE_INFOW(void)
+{
     /* LPHW_PROFILE_INFOW */
     TEST_TYPE(LPHW_PROFILE_INFOW, 4, 4);
     TEST_TYPE_POINTER(LPHW_PROFILE_INFOW, 244, 4);
+}
 
+static void test_pack_LPLDT_ENTRY(void)
+{
     /* LPLDT_ENTRY */
     TEST_TYPE(LPLDT_ENTRY, 4, 4);
+}
 
+static void test_pack_LPMEMORYSTATUS(void)
+{
     /* LPMEMORYSTATUS */
     TEST_TYPE(LPMEMORYSTATUS, 4, 4);
     TEST_TYPE_POINTER(LPMEMORYSTATUS, 32, 4);
+}
 
+static void test_pack_LPOFSTRUCT(void)
+{
     /* LPOFSTRUCT */
     TEST_TYPE(LPOFSTRUCT, 4, 4);
     TEST_TYPE_POINTER(LPOFSTRUCT, 136, 2);
+}
 
+static void test_pack_LPOSVERSIONINFOA(void)
+{
     /* LPOSVERSIONINFOA */
     TEST_TYPE(LPOSVERSIONINFOA, 4, 4);
     TEST_TYPE_POINTER(LPOSVERSIONINFOA, 148, 4);
+}
 
+static void test_pack_LPOSVERSIONINFOEXA(void)
+{
     /* LPOSVERSIONINFOEXA */
     TEST_TYPE(LPOSVERSIONINFOEXA, 4, 4);
+}
 
+static void test_pack_LPOSVERSIONINFOEXW(void)
+{
     /* LPOSVERSIONINFOEXW */
     TEST_TYPE(LPOSVERSIONINFOEXW, 4, 4);
+}
 
+static void test_pack_LPOSVERSIONINFOW(void)
+{
     /* LPOSVERSIONINFOW */
     TEST_TYPE(LPOSVERSIONINFOW, 4, 4);
     TEST_TYPE_POINTER(LPOSVERSIONINFOW, 276, 4);
+}
 
+static void test_pack_LPOVERLAPPED(void)
+{
     /* LPOVERLAPPED */
     TEST_TYPE(LPOVERLAPPED, 4, 4);
     TEST_TYPE_POINTER(LPOVERLAPPED, 20, 4);
+}
 
+static void test_pack_LPOVERLAPPED_COMPLETION_ROUTINE(void)
+{
     /* LPOVERLAPPED_COMPLETION_ROUTINE */
+    TEST_TYPE(LPOVERLAPPED_COMPLETION_ROUTINE, 4, 4);
+}
 
+static void test_pack_LPPROCESS_HEAP_ENTRY(void)
+{
     /* LPPROCESS_HEAP_ENTRY */
     TEST_TYPE(LPPROCESS_HEAP_ENTRY, 4, 4);
+}
 
+static void test_pack_LPPROCESS_INFORMATION(void)
+{
     /* LPPROCESS_INFORMATION */
     TEST_TYPE(LPPROCESS_INFORMATION, 4, 4);
     TEST_TYPE_POINTER(LPPROCESS_INFORMATION, 16, 4);
+}
 
+static void test_pack_LPPROGRESS_ROUTINE(void)
+{
     /* LPPROGRESS_ROUTINE */
+    TEST_TYPE(LPPROGRESS_ROUTINE, 4, 4);
+}
 
+static void test_pack_LPSECURITY_ATTRIBUTES(void)
+{
     /* LPSECURITY_ATTRIBUTES */
     TEST_TYPE(LPSECURITY_ATTRIBUTES, 4, 4);
     TEST_TYPE_POINTER(LPSECURITY_ATTRIBUTES, 12, 4);
+}
 
+static void test_pack_LPSTARTUPINFOA(void)
+{
     /* LPSTARTUPINFOA */
     TEST_TYPE(LPSTARTUPINFOA, 4, 4);
-    TEST_TYPE_POINTER(LPSTARTUPINFOA, 68, 4);
+}
 
+static void test_pack_LPSTARTUPINFOW(void)
+{
     /* LPSTARTUPINFOW */
     TEST_TYPE(LPSTARTUPINFOW, 4, 4);
     TEST_TYPE_POINTER(LPSTARTUPINFOW, 68, 4);
+}
 
+static void test_pack_LPSYSTEMTIME(void)
+{
     /* LPSYSTEMTIME */
     TEST_TYPE(LPSYSTEMTIME, 4, 4);
     TEST_TYPE_POINTER(LPSYSTEMTIME, 16, 2);
+}
 
+static void test_pack_LPSYSTEM_INFO(void)
+{
     /* LPSYSTEM_INFO */
     TEST_TYPE(LPSYSTEM_INFO, 4, 4);
+}
 
+static void test_pack_LPSYSTEM_POWER_STATUS(void)
+{
     /* LPSYSTEM_POWER_STATUS */
     TEST_TYPE(LPSYSTEM_POWER_STATUS, 4, 4);
     TEST_TYPE_POINTER(LPSYSTEM_POWER_STATUS, 12, 4);
+}
 
+static void test_pack_LPTHREAD_START_ROUTINE(void)
+{
     /* LPTHREAD_START_ROUTINE */
+    TEST_TYPE(LPTHREAD_START_ROUTINE, 4, 4);
+}
 
+static void test_pack_LPTIME_ZONE_INFORMATION(void)
+{
     /* LPTIME_ZONE_INFORMATION */
     TEST_TYPE(LPTIME_ZONE_INFORMATION, 4, 4);
     TEST_TYPE_POINTER(LPTIME_ZONE_INFORMATION, 172, 4);
+}
 
+static void test_pack_LPWIN32_FILE_ATTRIBUTE_DATA(void)
+{
     /* LPWIN32_FILE_ATTRIBUTE_DATA */
     TEST_TYPE(LPWIN32_FILE_ATTRIBUTE_DATA, 4, 4);
     TEST_TYPE_POINTER(LPWIN32_FILE_ATTRIBUTE_DATA, 36, 4);
+}
 
+static void test_pack_LPWIN32_FIND_DATAA(void)
+{
     /* LPWIN32_FIND_DATAA */
     TEST_TYPE(LPWIN32_FIND_DATAA, 4, 4);
     TEST_TYPE_POINTER(LPWIN32_FIND_DATAA, 320, 4);
+}
 
+static void test_pack_LPWIN32_FIND_DATAW(void)
+{
     /* LPWIN32_FIND_DATAW */
     TEST_TYPE(LPWIN32_FIND_DATAW, 4, 4);
     TEST_TYPE_POINTER(LPWIN32_FIND_DATAW, 592, 4);
+}
 
+static void test_pack_LPWIN32_STREAM_ID(void)
+{
     /* LPWIN32_STREAM_ID */
     TEST_TYPE(LPWIN32_STREAM_ID, 4, 4);
     TEST_TYPE_POINTER(LPWIN32_STREAM_ID, 24, 4);
+}
 
+static void test_pack_MEMORYSTATUS(void)
+{
     /* MEMORYSTATUS (pack 4) */
     TEST_TYPE(MEMORYSTATUS, 32, 4);
     TEST_FIELD(MEMORYSTATUS, DWORD, dwLength, 0, 4, 4);
@@ -385,7 +553,10 @@ void test_pack(void)
     TEST_FIELD(MEMORYSTATUS, SIZE_T, dwAvailPageFile, 20, 4, 4);
     TEST_FIELD(MEMORYSTATUS, SIZE_T, dwTotalVirtual, 24, 4, 4);
     TEST_FIELD(MEMORYSTATUS, SIZE_T, dwAvailVirtual, 28, 4, 4);
+}
 
+static void test_pack_OFSTRUCT(void)
+{
     /* OFSTRUCT (pack 4) */
     TEST_TYPE(OFSTRUCT, 136, 2);
     TEST_FIELD(OFSTRUCT, BYTE, cBytes, 0, 1, 1);
@@ -394,7 +565,10 @@ void test_pack(void)
     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);
+}
 
+static void test_pack_OSVERSIONINFOA(void)
+{
     /* OSVERSIONINFOA (pack 4) */
     TEST_TYPE(OSVERSIONINFOA, 148, 4);
     TEST_FIELD(OSVERSIONINFOA, DWORD, dwOSVersionInfoSize, 0, 4, 4);
@@ -403,7 +577,10 @@ void test_pack(void)
     TEST_FIELD(OSVERSIONINFOA, DWORD, dwBuildNumber, 12, 4, 4);
     TEST_FIELD(OSVERSIONINFOA, DWORD, dwPlatformId, 16, 4, 4);
     TEST_FIELD(OSVERSIONINFOA, CHAR[128], szCSDVersion, 20, 128, 1);
+}
 
+static void test_pack_OSVERSIONINFOEXA(void)
+{
     /* OSVERSIONINFOEXA (pack 4) */
     TEST_FIELD(OSVERSIONINFOEXA, DWORD, dwOSVersionInfoSize, 0, 4, 4);
     TEST_FIELD(OSVERSIONINFOEXA, DWORD, dwMajorVersion, 4, 4, 4);
@@ -413,7 +590,10 @@ 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);
+}
 
+static void test_pack_OSVERSIONINFOEXW(void)
+{
     /* OSVERSIONINFOEXW (pack 4) */
     TEST_FIELD(OSVERSIONINFOEXW, DWORD, dwOSVersionInfoSize, 0, 4, 4);
     TEST_FIELD(OSVERSIONINFOEXW, DWORD, dwMajorVersion, 4, 4, 4);
@@ -423,7 +603,10 @@ 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);
+}
 
+static void test_pack_OSVERSIONINFOW(void)
+{
     /* OSVERSIONINFOW (pack 4) */
     TEST_TYPE(OSVERSIONINFOW, 276, 4);
     TEST_FIELD(OSVERSIONINFOW, DWORD, dwOSVersionInfoSize, 0, 4, 4);
@@ -432,13 +615,15 @@ void test_pack(void)
     TEST_FIELD(OSVERSIONINFOW, DWORD, dwBuildNumber, 12, 4, 4);
     TEST_FIELD(OSVERSIONINFOW, DWORD, dwPlatformId, 16, 4, 4);
     TEST_FIELD(OSVERSIONINFOW, WCHAR[128], szCSDVersion, 20, 256, 2);
+}
 
+static void test_pack_OUTPUT_DEBUG_STRING_INFO(void)
+{
     /* OUTPUT_DEBUG_STRING_INFO (pack 4) */
-    TEST_TYPE(OUTPUT_DEBUG_STRING_INFO, 8, 4);
+}
-    TEST_FIELD(OUTPUT_DEBUG_STRING_INFO, LPSTR, lpDebugStringData, 0, 4, 4);
-    TEST_FIELD(OUTPUT_DEBUG_STRING_INFO, WORD, fUnicode, 4, 2, 2);
-    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, DWORD, Internal, 0, 4, 4);
@@ -446,114 +631,171 @@ void test_pack(void)
     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_PAPCFUNC(void)
+{
     /* PAPCFUNC */
+    TEST_TYPE(PAPCFUNC, 4, 4);
+}
 
+static void test_pack_PBY_HANDLE_FILE_INFORMATION(void)
+{
     /* PBY_HANDLE_FILE_INFORMATION */
     TEST_TYPE(PBY_HANDLE_FILE_INFORMATION, 4, 4);
     TEST_TYPE_POINTER(PBY_HANDLE_FILE_INFORMATION, 52, 4);
+}
 
+static void test_pack_PCRITICAL_SECTION(void)
+{
     /* PCRITICAL_SECTION */
     TEST_TYPE(PCRITICAL_SECTION, 4, 4);
+}
 
+static void test_pack_PCRITICAL_SECTION_DEBUG(void)
+{
     /* PCRITICAL_SECTION_DEBUG */
     TEST_TYPE(PCRITICAL_SECTION_DEBUG, 4, 4);
+}
 
+static void test_pack_PFIBER_START_ROUTINE(void)
+{
     /* PFIBER_START_ROUTINE */
+    TEST_TYPE(PFIBER_START_ROUTINE, 4, 4);
+}
 
+static void test_pack_POFSTRUCT(void)
+{
     /* POFSTRUCT */
     TEST_TYPE(POFSTRUCT, 4, 4);
     TEST_TYPE_POINTER(POFSTRUCT, 136, 2);
+}
 
+static void test_pack_POSVERSIONINFOA(void)
+{
     /* POSVERSIONINFOA */
     TEST_TYPE(POSVERSIONINFOA, 4, 4);
     TEST_TYPE_POINTER(POSVERSIONINFOA, 148, 4);
+}
 
+static void test_pack_POSVERSIONINFOEXA(void)
+{
     /* POSVERSIONINFOEXA */
     TEST_TYPE(POSVERSIONINFOEXA, 4, 4);
+}
 
+static void test_pack_POSVERSIONINFOEXW(void)
+{
     /* POSVERSIONINFOEXW */
     TEST_TYPE(POSVERSIONINFOEXW, 4, 4);
+}
 
+static void test_pack_POSVERSIONINFOW(void)
+{
     /* POSVERSIONINFOW */
     TEST_TYPE(POSVERSIONINFOW, 4, 4);
     TEST_TYPE_POINTER(POSVERSIONINFOW, 276, 4);
+}
 
+static void test_pack_PPROCESS_HEAP_ENTRY(void)
+{
     /* PPROCESS_HEAP_ENTRY */
     TEST_TYPE(PPROCESS_HEAP_ENTRY, 4, 4);
+}
 
+static void test_pack_PPROCESS_INFORMATION(void)
+{
     /* PPROCESS_INFORMATION */
     TEST_TYPE(PPROCESS_INFORMATION, 4, 4);
     TEST_TYPE_POINTER(PPROCESS_INFORMATION, 16, 4);
+}
 
+static void test_pack_PROCESS_HEAP_ENTRY(void)
+{
     /* PROCESS_HEAP_ENTRY (pack 4) */
     TEST_FIELD(PROCESS_HEAP_ENTRY, LPVOID, lpData, 0, 4, 4);
     TEST_FIELD(PROCESS_HEAP_ENTRY, DWORD, cbData, 4, 4, 4);
     TEST_FIELD(PROCESS_HEAP_ENTRY, BYTE, cbOverhead, 8, 1, 1);
     TEST_FIELD(PROCESS_HEAP_ENTRY, BYTE, iRegionIndex, 9, 1, 1);
     TEST_FIELD(PROCESS_HEAP_ENTRY, WORD, wFlags, 10, 2, 2);
+}
 
+static void test_pack_PROCESS_INFORMATION(void)
+{
     /* PROCESS_INFORMATION (pack 4) */
     TEST_TYPE(PROCESS_INFORMATION, 16, 4);
     TEST_FIELD(PROCESS_INFORMATION, HANDLE, hProcess, 0, 4, 4);
     TEST_FIELD(PROCESS_INFORMATION, HANDLE, hThread, 4, 4, 4);
     TEST_FIELD(PROCESS_INFORMATION, DWORD, dwProcessId, 8, 4, 4);
     TEST_FIELD(PROCESS_INFORMATION, DWORD, dwThreadId, 12, 4, 4);
+}
 
+static void test_pack_PSECURITY_ATTRIBUTES(void)
+{
     /* PSECURITY_ATTRIBUTES */
     TEST_TYPE(PSECURITY_ATTRIBUTES, 4, 4);
     TEST_TYPE_POINTER(PSECURITY_ATTRIBUTES, 12, 4);
+}
 
+static void test_pack_PSYSTEMTIME(void)
+{
     /* PSYSTEMTIME */
     TEST_TYPE(PSYSTEMTIME, 4, 4);
     TEST_TYPE_POINTER(PSYSTEMTIME, 16, 2);
+}
 
+static void test_pack_PTIMERAPCROUTINE(void)
+{
     /* PTIMERAPCROUTINE */
+    TEST_TYPE(PTIMERAPCROUTINE, 4, 4);
+}
 
+static void test_pack_PTIME_ZONE_INFORMATION(void)
+{
     /* PTIME_ZONE_INFORMATION */
     TEST_TYPE(PTIME_ZONE_INFORMATION, 4, 4);
     TEST_TYPE_POINTER(PTIME_ZONE_INFORMATION, 172, 4);
+}
 
+static void test_pack_PWIN32_FIND_DATAA(void)
+{
     /* PWIN32_FIND_DATAA */
     TEST_TYPE(PWIN32_FIND_DATAA, 4, 4);
     TEST_TYPE_POINTER(PWIN32_FIND_DATAA, 320, 4);
+}
 
+static void test_pack_PWIN32_FIND_DATAW(void)
+{
     /* PWIN32_FIND_DATAW */
     TEST_TYPE(PWIN32_FIND_DATAW, 4, 4);
     TEST_TYPE_POINTER(PWIN32_FIND_DATAW, 592, 4);
+}
 
+static void test_pack_RIP_INFO(void)
+{
     /* RIP_INFO (pack 4) */
     TEST_TYPE(RIP_INFO, 8, 4);
     TEST_FIELD(RIP_INFO, DWORD, dwError, 0, 4, 4);
     TEST_FIELD(RIP_INFO, DWORD, dwType, 4, 4, 4);
+}
 
+static void test_pack_SECURITY_ATTRIBUTES(void)
+{
     /* SECURITY_ATTRIBUTES (pack 4) */
     TEST_TYPE(SECURITY_ATTRIBUTES, 12, 4);
     TEST_FIELD(SECURITY_ATTRIBUTES, DWORD, nLength, 0, 4, 4);
     TEST_FIELD(SECURITY_ATTRIBUTES, LPVOID, lpSecurityDescriptor, 4, 4, 4);
     TEST_FIELD(SECURITY_ATTRIBUTES, BOOL, bInheritHandle, 8, 4, 4);
+}
 
+static void test_pack_STARTUPINFOA(void)
+{
     /* STARTUPINFOA (pack 4) */
-    TEST_TYPE(STARTUPINFOA, 68, 4);
     TEST_FIELD(STARTUPINFOA, DWORD, cb, 0, 4, 4);
-    TEST_FIELD(STARTUPINFOA, LPSTR, lpReserved, 4, 4, 4);
+}
-    TEST_FIELD(STARTUPINFOA, LPSTR, lpDesktop, 8, 4, 4);
-    TEST_FIELD(STARTUPINFOA, LPSTR, lpTitle, 12, 4, 4);
-    TEST_FIELD(STARTUPINFOA, DWORD, dwX, 16, 4, 4);
-    TEST_FIELD(STARTUPINFOA, DWORD, dwY, 20, 4, 4);
-    TEST_FIELD(STARTUPINFOA, DWORD, dwXSize, 24, 4, 4);
-    TEST_FIELD(STARTUPINFOA, DWORD, dwYSize, 28, 4, 4);
-    TEST_FIELD(STARTUPINFOA, DWORD, dwXCountChars, 32, 4, 4);
-    TEST_FIELD(STARTUPINFOA, DWORD, dwYCountChars, 36, 4, 4);
-    TEST_FIELD(STARTUPINFOA, DWORD, dwFillAttribute, 40, 4, 4);
-    TEST_FIELD(STARTUPINFOA, DWORD, dwFlags, 44, 4, 4);
-    TEST_FIELD(STARTUPINFOA, WORD, wShowWindow, 48, 2, 2);
-    TEST_FIELD(STARTUPINFOA, WORD, cbReserved2, 50, 2, 2);
-    TEST_FIELD(STARTUPINFOA, BYTE *, lpReserved2, 52, 4, 4);
-    TEST_FIELD(STARTUPINFOA, HANDLE, hStdInput, 56, 4, 4);
-    TEST_FIELD(STARTUPINFOA, HANDLE, hStdOutput, 60, 4, 4);
-    TEST_FIELD(STARTUPINFOA, HANDLE, hStdError, 64, 4, 4);
 
+static void test_pack_STARTUPINFOW(void)
+{
     /* STARTUPINFOW (pack 4) */
     TEST_TYPE(STARTUPINFOW, 68, 4);
     TEST_FIELD(STARTUPINFOW, DWORD, cb, 0, 4, 4);
@@ -574,7 +816,10 @@ void test_pack(void)
     TEST_FIELD(STARTUPINFOW, HANDLE, hStdInput, 56, 4, 4);
     TEST_FIELD(STARTUPINFOW, HANDLE, hStdOutput, 60, 4, 4);
     TEST_FIELD(STARTUPINFOW, HANDLE, hStdError, 64, 4, 4);
+}
 
+static void test_pack_SYSTEMTIME(void)
+{
     /* SYSTEMTIME (pack 4) */
     TEST_TYPE(SYSTEMTIME, 16, 2);
     TEST_FIELD(SYSTEMTIME, WORD, wYear, 0, 2, 2);
@@ -585,7 +830,10 @@ void test_pack(void)
     TEST_FIELD(SYSTEMTIME, WORD, wMinute, 10, 2, 2);
     TEST_FIELD(SYSTEMTIME, WORD, wSecond, 12, 2, 2);
     TEST_FIELD(SYSTEMTIME, WORD, wMilliseconds, 14, 2, 2);
+}
 
+static void test_pack_SYSTEM_POWER_STATUS(void)
+{
     /* SYSTEM_POWER_STATUS (pack 4) */
     TEST_TYPE(SYSTEM_POWER_STATUS, 12, 4);
     TEST_FIELD(SYSTEM_POWER_STATUS, BYTE, ACLineStatus, 0, 1, 1);
@@ -594,7 +842,10 @@ void test_pack(void)
     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);
+}
 
+static void test_pack_TIME_ZONE_INFORMATION(void)
+{
     /* TIME_ZONE_INFORMATION (pack 4) */
     TEST_TYPE(TIME_ZONE_INFORMATION, 172, 4);
     TEST_FIELD(TIME_ZONE_INFORMATION, LONG, Bias, 0, 4, 4);
@@ -604,13 +855,17 @@ void test_pack(void)
     TEST_FIELD(TIME_ZONE_INFORMATION, WCHAR[32], DaylightName, 88, 64, 2);
     TEST_FIELD(TIME_ZONE_INFORMATION, SYSTEMTIME, DaylightDate, 152, 16, 2);
     TEST_FIELD(TIME_ZONE_INFORMATION, LONG, DaylightBias, 168, 4, 4);
+}
 
+static void test_pack_UNLOAD_DLL_DEBUG_INFO(void)
+{
     /* UNLOAD_DLL_DEBUG_INFO (pack 4) */
     TEST_TYPE(UNLOAD_DLL_DEBUG_INFO, 4, 4);
     TEST_FIELD(UNLOAD_DLL_DEBUG_INFO, LPVOID, lpBaseOfDll, 0, 4, 4);
+}
 
-    /* WAITORTIMERCALLBACK */
+static void test_pack_WIN32_FILE_ATTRIBUTE_DATA(void)
-
+{
     /* WIN32_FILE_ATTRIBUTE_DATA (pack 4) */
     TEST_TYPE(WIN32_FILE_ATTRIBUTE_DATA, 36, 4);
     TEST_FIELD(WIN32_FILE_ATTRIBUTE_DATA, DWORD, dwFileAttributes, 0, 4, 4);
@@ -619,7 +874,10 @@ void test_pack(void)
     TEST_FIELD(WIN32_FILE_ATTRIBUTE_DATA, FILETIME, ftLastWriteTime, 20, 8, 4);
     TEST_FIELD(WIN32_FILE_ATTRIBUTE_DATA, DWORD, nFileSizeHigh, 28, 4, 4);
     TEST_FIELD(WIN32_FILE_ATTRIBUTE_DATA, DWORD, nFileSizeLow, 32, 4, 4);
+}
 
+static void test_pack_WIN32_FIND_DATAA(void)
+{
     /* WIN32_FIND_DATAA (pack 4) */
     TEST_TYPE(WIN32_FIND_DATAA, 320, 4);
     TEST_FIELD(WIN32_FIND_DATAA, DWORD, dwFileAttributes, 0, 4, 4);
@@ -632,7 +890,10 @@ void test_pack(void)
     TEST_FIELD(WIN32_FIND_DATAA, DWORD, dwReserved1, 40, 4, 4);
     TEST_FIELD(WIN32_FIND_DATAA, CHAR[260], cFileName, 44, 260, 1);
     TEST_FIELD(WIN32_FIND_DATAA, CHAR[14], cAlternateFileName, 304, 14, 1);
+}
 
+static void test_pack_WIN32_FIND_DATAW(void)
+{
     /* WIN32_FIND_DATAW (pack 4) */
     TEST_TYPE(WIN32_FIND_DATAW, 592, 4);
     TEST_FIELD(WIN32_FIND_DATAW, DWORD, dwFileAttributes, 0, 4, 4);
@@ -645,7 +906,106 @@ void test_pack(void)
     TEST_FIELD(WIN32_FIND_DATAW, DWORD, dwReserved1, 40, 4, 4);
     TEST_FIELD(WIN32_FIND_DATAW, WCHAR[260], cFileName, 44, 520, 2);
     TEST_FIELD(WIN32_FIND_DATAW, WCHAR[14], cAlternateFileName, 564, 28, 2);
+}
 
+static void test_pack(void)
+{
+    test_pack_BY_HANDLE_FILE_INFORMATION();
+    test_pack_COMMCONFIG();
+    test_pack_COMMPROP();
+    test_pack_COMMTIMEOUTS();
+    test_pack_COMSTAT();
+    test_pack_CREATE_PROCESS_DEBUG_INFO();
+    test_pack_CREATE_THREAD_DEBUG_INFO();
+    test_pack_CRITICAL_SECTION();
+    test_pack_CRITICAL_SECTION_DEBUG();
+    test_pack_DCB();
+    test_pack_DEBUG_EVENT();
+    test_pack_EXCEPTION_DEBUG_INFO();
+    test_pack_EXIT_PROCESS_DEBUG_INFO();
+    test_pack_EXIT_THREAD_DEBUG_INFO();
+    test_pack_HW_PROFILE_INFOA();
+    test_pack_HW_PROFILE_INFOW();
+    test_pack_LDT_ENTRY();
+    test_pack_LOAD_DLL_DEBUG_INFO();
+    test_pack_LPBY_HANDLE_FILE_INFORMATION();
+    test_pack_LPCOMMCONFIG();
+    test_pack_LPCOMMPROP();
+    test_pack_LPCOMMTIMEOUTS();
+    test_pack_LPCOMSTAT();
+    test_pack_LPCONTEXT();
+    test_pack_LPCRITICAL_SECTION();
+    test_pack_LPCRITICAL_SECTION_DEBUG();
+    test_pack_LPDCB();
+    test_pack_LPDEBUG_EVENT();
+    test_pack_LPEXCEPTION_POINTERS();
+    test_pack_LPEXCEPTION_RECORD();
+    test_pack_LPFIBER_START_ROUTINE();
+    test_pack_LPHW_PROFILE_INFOA();
+    test_pack_LPHW_PROFILE_INFOW();
+    test_pack_LPLDT_ENTRY();
+    test_pack_LPMEMORYSTATUS();
+    test_pack_LPOFSTRUCT();
+    test_pack_LPOSVERSIONINFOA();
+    test_pack_LPOSVERSIONINFOEXA();
+    test_pack_LPOSVERSIONINFOEXW();
+    test_pack_LPOSVERSIONINFOW();
+    test_pack_LPOVERLAPPED();
+    test_pack_LPOVERLAPPED_COMPLETION_ROUTINE();
+    test_pack_LPPROCESS_HEAP_ENTRY();
+    test_pack_LPPROCESS_INFORMATION();
+    test_pack_LPPROGRESS_ROUTINE();
+    test_pack_LPSECURITY_ATTRIBUTES();
+    test_pack_LPSTARTUPINFOA();
+    test_pack_LPSTARTUPINFOW();
+    test_pack_LPSYSTEMTIME();
+    test_pack_LPSYSTEM_INFO();
+    test_pack_LPSYSTEM_POWER_STATUS();
+    test_pack_LPTHREAD_START_ROUTINE();
+    test_pack_LPTIME_ZONE_INFORMATION();
+    test_pack_LPWIN32_FILE_ATTRIBUTE_DATA();
+    test_pack_LPWIN32_FIND_DATAA();
+    test_pack_LPWIN32_FIND_DATAW();
+    test_pack_LPWIN32_STREAM_ID();
+    test_pack_MEMORYSTATUS();
+    test_pack_OFSTRUCT();
+    test_pack_OSVERSIONINFOA();
+    test_pack_OSVERSIONINFOEXA();
+    test_pack_OSVERSIONINFOEXW();
+    test_pack_OSVERSIONINFOW();
+    test_pack_OUTPUT_DEBUG_STRING_INFO();
+    test_pack_OVERLAPPED();
+    test_pack_PAPCFUNC();
+    test_pack_PBY_HANDLE_FILE_INFORMATION();
+    test_pack_PCRITICAL_SECTION();
+    test_pack_PCRITICAL_SECTION_DEBUG();
+    test_pack_PFIBER_START_ROUTINE();
+    test_pack_POFSTRUCT();
+    test_pack_POSVERSIONINFOA();
+    test_pack_POSVERSIONINFOEXA();
+    test_pack_POSVERSIONINFOEXW();
+    test_pack_POSVERSIONINFOW();
+    test_pack_PPROCESS_HEAP_ENTRY();
+    test_pack_PPROCESS_INFORMATION();
+    test_pack_PROCESS_HEAP_ENTRY();
+    test_pack_PROCESS_INFORMATION();
+    test_pack_PSECURITY_ATTRIBUTES();
+    test_pack_PSYSTEMTIME();
+    test_pack_PTIMERAPCROUTINE();
+    test_pack_PTIME_ZONE_INFORMATION();
+    test_pack_PWIN32_FIND_DATAA();
+    test_pack_PWIN32_FIND_DATAW();
+    test_pack_RIP_INFO();
+    test_pack_SECURITY_ATTRIBUTES();
+    test_pack_STARTUPINFOA();
+    test_pack_STARTUPINFOW();
+    test_pack_SYSTEMTIME();
+    test_pack_SYSTEM_POWER_STATUS();
+    test_pack_TIME_ZONE_INFORMATION();
+    test_pack_UNLOAD_DLL_DEBUG_INFO();
+    test_pack_WIN32_FILE_ATTRIBUTE_DATA();
+    test_pack_WIN32_FIND_DATAA();
+    test_pack_WIN32_FIND_DATAW();
 }
 
 START_TEST(generated)