[PATCH 1/2] winapi_test: tests.dat needs timezoneapi.h.

Serge Gautherie winehq-git_serge_180711 at gautherie.fr
Sun Apr 12 12:13:27 CDT 2020


Addendum to 1d05798d9b38149d36d84463bb8be294ade9d515.

Signed-off-by: Serge Gautherie <winehq-git_serge_180711 at gautherie.fr>
---
 dlls/kernel32/tests/generated.c | 184 ++++++++++++++++++++--------------------
 tools/winapi/tests.dat          |   1 +
 2 files changed, 93 insertions(+), 92 deletions(-)

diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c
index 7c57fea..09ce146 100644
--- a/dlls/kernel32/tests/generated.c
+++ b/dlls/kernel32/tests/generated.c
@@ -1140,15 +1140,6 @@ static void test_pack_LPTHREAD_START_ROUTINE(void)
     TEST_TYPE_ALIGN  (LPTHREAD_START_ROUTINE, 8)
 }
 
-static void test_pack_LPTIME_ZONE_INFORMATION(void)
-{
-    /* LPTIME_ZONE_INFORMATION */
-    TEST_TYPE_SIZE   (LPTIME_ZONE_INFORMATION, 8)
-    TEST_TYPE_ALIGN  (LPTIME_ZONE_INFORMATION, 8)
-    TEST_TARGET_SIZE (LPTIME_ZONE_INFORMATION, 172)
-    TEST_TARGET_ALIGN(LPTIME_ZONE_INFORMATION, 4)
-}
-
 static void test_pack_LPWIN32_FILE_ATTRIBUTE_DATA(void)
 {
     /* LPWIN32_FILE_ATTRIBUTE_DATA */
@@ -1523,15 +1514,6 @@ static void test_pack_PTIMERAPCROUTINE(void)
     TEST_TYPE_ALIGN  (PTIMERAPCROUTINE, 8)
 }
 
-static void test_pack_PTIME_ZONE_INFORMATION(void)
-{
-    /* PTIME_ZONE_INFORMATION */
-    TEST_TYPE_SIZE   (PTIME_ZONE_INFORMATION, 8)
-    TEST_TYPE_ALIGN  (PTIME_ZONE_INFORMATION, 8)
-    TEST_TARGET_SIZE (PTIME_ZONE_INFORMATION, 172)
-    TEST_TARGET_ALIGN(PTIME_ZONE_INFORMATION, 4)
-}
-
 static void test_pack_PWIN32_FIND_DATAA(void)
 {
     /* PWIN32_FIND_DATAA */
@@ -1762,34 +1744,6 @@ static void test_pack_SYSTEM_POWER_STATUS(void)
     TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryFullLifeTime, 8)
 }
 
-static void test_pack_TIME_ZONE_INFORMATION(void)
-{
-    /* TIME_ZONE_INFORMATION */
-    TEST_TYPE_SIZE   (TIME_ZONE_INFORMATION, 172)
-    TEST_TYPE_ALIGN  (TIME_ZONE_INFORMATION, 4)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, Bias, 4)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, Bias, 4)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, Bias, 0)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardName, 64)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardName, 2)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardName, 4)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardDate, 16)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardDate, 2)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardDate, 68)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardBias, 4)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardBias, 4)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardBias, 84)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightName, 64)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightName, 2)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightName, 88)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightDate, 16)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightDate, 2)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightDate, 152)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightBias, 4)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightBias, 4)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightBias, 168)
-}
-
 static void test_pack_UNLOAD_DLL_DEBUG_INFO(void)
 {
     /* UNLOAD_DLL_DEBUG_INFO */
@@ -1928,6 +1882,52 @@ static void test_pack_WIN32_STREAM_ID(void)
     TEST_FIELD_OFFSET(WIN32_STREAM_ID, cStreamName, 20)
 }
 
+static void test_pack_LPTIME_ZONE_INFORMATION(void)
+{
+    /* LPTIME_ZONE_INFORMATION */
+    TEST_TYPE_SIZE   (LPTIME_ZONE_INFORMATION, 8)
+    TEST_TYPE_ALIGN  (LPTIME_ZONE_INFORMATION, 8)
+    TEST_TARGET_SIZE (LPTIME_ZONE_INFORMATION, 172)
+    TEST_TARGET_ALIGN(LPTIME_ZONE_INFORMATION, 4)
+}
+
+static void test_pack_PTIME_ZONE_INFORMATION(void)
+{
+    /* PTIME_ZONE_INFORMATION */
+    TEST_TYPE_SIZE   (PTIME_ZONE_INFORMATION, 8)
+    TEST_TYPE_ALIGN  (PTIME_ZONE_INFORMATION, 8)
+    TEST_TARGET_SIZE (PTIME_ZONE_INFORMATION, 172)
+    TEST_TARGET_ALIGN(PTIME_ZONE_INFORMATION, 4)
+}
+
+static void test_pack_TIME_ZONE_INFORMATION(void)
+{
+    /* TIME_ZONE_INFORMATION */
+    TEST_TYPE_SIZE   (TIME_ZONE_INFORMATION, 172)
+    TEST_TYPE_ALIGN  (TIME_ZONE_INFORMATION, 4)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, Bias, 4)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, Bias, 4)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, Bias, 0)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardName, 64)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardName, 2)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardName, 4)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardDate, 16)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardDate, 2)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardDate, 68)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardBias, 4)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardBias, 4)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardBias, 84)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightName, 64)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightName, 2)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightName, 88)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightDate, 16)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightDate, 2)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightDate, 152)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightBias, 4)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightBias, 4)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightBias, 168)
+}
+
 #else /* _WIN64 */
 
 static void test_pack_LPOSVERSIONINFOA(void)
@@ -2997,15 +2997,6 @@ static void test_pack_LPTHREAD_START_ROUTINE(void)
     TEST_TYPE_ALIGN  (LPTHREAD_START_ROUTINE, 4)
 }
 
-static void test_pack_LPTIME_ZONE_INFORMATION(void)
-{
-    /* LPTIME_ZONE_INFORMATION */
-    TEST_TYPE_SIZE   (LPTIME_ZONE_INFORMATION, 4)
-    TEST_TYPE_ALIGN  (LPTIME_ZONE_INFORMATION, 4)
-    TEST_TARGET_SIZE (LPTIME_ZONE_INFORMATION, 172)
-    TEST_TARGET_ALIGN(LPTIME_ZONE_INFORMATION, 4)
-}
-
 static void test_pack_LPWIN32_FILE_ATTRIBUTE_DATA(void)
 {
     /* LPWIN32_FILE_ATTRIBUTE_DATA */
@@ -3380,15 +3371,6 @@ static void test_pack_PTIMERAPCROUTINE(void)
     TEST_TYPE_ALIGN  (PTIMERAPCROUTINE, 4)
 }
 
-static void test_pack_PTIME_ZONE_INFORMATION(void)
-{
-    /* PTIME_ZONE_INFORMATION */
-    TEST_TYPE_SIZE   (PTIME_ZONE_INFORMATION, 4)
-    TEST_TYPE_ALIGN  (PTIME_ZONE_INFORMATION, 4)
-    TEST_TARGET_SIZE (PTIME_ZONE_INFORMATION, 172)
-    TEST_TARGET_ALIGN(PTIME_ZONE_INFORMATION, 4)
-}
-
 static void test_pack_PWIN32_FIND_DATAA(void)
 {
     /* PWIN32_FIND_DATAA */
@@ -3619,34 +3601,6 @@ static void test_pack_SYSTEM_POWER_STATUS(void)
     TEST_FIELD_OFFSET(SYSTEM_POWER_STATUS, BatteryFullLifeTime, 8)
 }
 
-static void test_pack_TIME_ZONE_INFORMATION(void)
-{
-    /* TIME_ZONE_INFORMATION */
-    TEST_TYPE_SIZE   (TIME_ZONE_INFORMATION, 172)
-    TEST_TYPE_ALIGN  (TIME_ZONE_INFORMATION, 4)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, Bias, 4)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, Bias, 4)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, Bias, 0)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardName, 64)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardName, 2)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardName, 4)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardDate, 16)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardDate, 2)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardDate, 68)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardBias, 4)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardBias, 4)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardBias, 84)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightName, 64)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightName, 2)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightName, 88)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightDate, 16)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightDate, 2)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightDate, 152)
-    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightBias, 4)
-    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightBias, 4)
-    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightBias, 168)
-}
-
 static void test_pack_UNLOAD_DLL_DEBUG_INFO(void)
 {
     /* UNLOAD_DLL_DEBUG_INFO */
@@ -3785,6 +3739,52 @@ static void test_pack_WIN32_STREAM_ID(void)
     TEST_FIELD_OFFSET(WIN32_STREAM_ID, cStreamName, 20)
 }
 
+static void test_pack_LPTIME_ZONE_INFORMATION(void)
+{
+    /* LPTIME_ZONE_INFORMATION */
+    TEST_TYPE_SIZE   (LPTIME_ZONE_INFORMATION, 4)
+    TEST_TYPE_ALIGN  (LPTIME_ZONE_INFORMATION, 4)
+    TEST_TARGET_SIZE (LPTIME_ZONE_INFORMATION, 172)
+    TEST_TARGET_ALIGN(LPTIME_ZONE_INFORMATION, 4)
+}
+
+static void test_pack_PTIME_ZONE_INFORMATION(void)
+{
+    /* PTIME_ZONE_INFORMATION */
+    TEST_TYPE_SIZE   (PTIME_ZONE_INFORMATION, 4)
+    TEST_TYPE_ALIGN  (PTIME_ZONE_INFORMATION, 4)
+    TEST_TARGET_SIZE (PTIME_ZONE_INFORMATION, 172)
+    TEST_TARGET_ALIGN(PTIME_ZONE_INFORMATION, 4)
+}
+
+static void test_pack_TIME_ZONE_INFORMATION(void)
+{
+    /* TIME_ZONE_INFORMATION */
+    TEST_TYPE_SIZE   (TIME_ZONE_INFORMATION, 172)
+    TEST_TYPE_ALIGN  (TIME_ZONE_INFORMATION, 4)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, Bias, 4)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, Bias, 4)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, Bias, 0)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardName, 64)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardName, 2)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardName, 4)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardDate, 16)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardDate, 2)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardDate, 68)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, StandardBias, 4)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, StandardBias, 4)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, StandardBias, 84)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightName, 64)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightName, 2)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightName, 88)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightDate, 16)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightDate, 2)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightDate, 152)
+    TEST_FIELD_SIZE  (TIME_ZONE_INFORMATION, DaylightBias, 4)
+    TEST_FIELD_ALIGN (TIME_ZONE_INFORMATION, DaylightBias, 4)
+    TEST_FIELD_OFFSET(TIME_ZONE_INFORMATION, DaylightBias, 168)
+}
+
 #endif /* _WIN64 */
 
 static void test_pack(void)
diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat
index 9179d94..254711b 100644
--- a/tools/winapi/tests.dat
+++ b/tools/winapi/tests.dat
@@ -472,6 +472,7 @@ basetsd.h
 winnt.h
 windef.h
 winbase.h
+timezoneapi.h
 
 %include
 
-- 
2.10.0.windows.1




More information about the wine-devel mailing list