From: Serge Gautherie <reactos-git_serge_fake@gautherie.fr>
Date: Thu, 30 Dec 2016 16:30:00 +0100
Subject: [WINETESTS]
kernel32/:
*CMakeLists.txt:
 *Uncomment out generated.c.
*generated.c:
 *Properly adapt/fix test_pack_COMMCONFIG() and test_pack_LPEXCEPTION_RECORD().
*testlist.c:
 *Remove func_dosdev() and func_interlck() (leftovers from r61303),
 *Add func_cpu (missed in r66620),
 *Uncomment out func_debugger (Not just yet!) and func_generated.
ROSTESTS-251


Index: rostests/winetests/kernel32/CMakeLists.txt
--- a/rostests/winetests/kernel32/CMakeLists.txt
+++ b/rostests/winetests/kernel32/CMakeLists.txt
@@ -17,7 +17,7 @@ list(APPEND SOURCE
     fiber.c
     file.c
     format_msg.c
-    #generated.c
+    generated.c
     heap.c
     loader.c
     locale.c
Index: rostests/winetests/kernel32/generated.c
--- a/rostests/winetests/kernel32/generated.c
+++ b/rostests/winetests/kernel32/generated.c
@@ -546,8 +546,15 @@ static void test_pack_COMMCONFIG(void)
     TEST_FIELD_SIZE  (COMMCONFIG, dwProviderSize, 4)
     TEST_FIELD_ALIGN (COMMCONFIG, dwProviderSize, 4)
     TEST_FIELD_OFFSET(COMMCONFIG, dwProviderSize, 44)
+#ifdef __REACTOS__
+    /* WCHAR wcProviderData[1], official. (See ROSTESTS-251.) */
+    TEST_FIELD_SIZE  (COMMCONFIG, wcProviderData, 2)
+    TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 2)
+#else
+    /* DWORD wcProviderData[1], Wine enlarged. */
     TEST_FIELD_SIZE  (COMMCONFIG, wcProviderData, 4)
     TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 4)
+#endif
     TEST_FIELD_OFFSET(COMMCONFIG, wcProviderData, 48)
 }
 
@@ -989,12 +996,18 @@ static void test_pack_LPEXCEPTION_POINTERS(void)
     TEST_TYPE_ALIGN  (LPEXCEPTION_POINTERS, 8)
 }
 
-//static void test_pack_LPEXCEPTION_RECORD(void)
-//{
-//    /* LPEXCEPTION_RECORD */
-//    TEST_TYPE_SIZE   (LPEXCEPTION_RECORD, 8)
-//    TEST_TYPE_ALIGN  (LPEXCEPTION_RECORD, 8)
-//}
+static void test_pack_LPEXCEPTION_RECORD(void)
+{
+#ifdef __REACTOS__
+    /* PEXCEPTION_RECORD, official. (See ROSTESTS-251.) */
+    TEST_TYPE_SIZE   (PEXCEPTION_RECORD, 8)
+    TEST_TYPE_ALIGN  (PEXCEPTION_RECORD, 8)
+#else
+    /* LPEXCEPTION_RECORD, Wine synonym. */
+    TEST_TYPE_SIZE   (LPEXCEPTION_RECORD, 8)
+    TEST_TYPE_ALIGN  (LPEXCEPTION_RECORD, 8)
+#endif
+}
 
 static void test_pack_LPFIBER_START_ROUTINE(void)
 {
@@ -2403,8 +2416,15 @@ static void test_pack_COMMCONFIG(void)
     TEST_FIELD_SIZE  (COMMCONFIG, dwProviderSize, 4)
     TEST_FIELD_ALIGN (COMMCONFIG, dwProviderSize, 4)
     TEST_FIELD_OFFSET(COMMCONFIG, dwProviderSize, 44)
+#ifdef __REACTOS__
+    /* WCHAR wcProviderData[1], official. (See ROSTESTS-251.) */
+    TEST_FIELD_SIZE  (COMMCONFIG, wcProviderData, 2)
+    TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 2)
+#else
+    /* DWORD wcProviderData[1], Wine enlarged. */
     TEST_FIELD_SIZE  (COMMCONFIG, wcProviderData, 4)
     TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 4)
+#endif
     TEST_FIELD_OFFSET(COMMCONFIG, wcProviderData, 48)
 }
 
@@ -2846,12 +2866,18 @@ static void test_pack_LPEXCEPTION_POINTERS(void)
     TEST_TYPE_ALIGN  (LPEXCEPTION_POINTERS, 4)
 }
 
-//static void test_pack_LPEXCEPTION_RECORD(void)
-//{
-//    /* LPEXCEPTION_RECORD */
-//    TEST_TYPE_SIZE   (LPEXCEPTION_RECORD, 4)
-//    TEST_TYPE_ALIGN  (LPEXCEPTION_RECORD, 4)
-//}
+static void test_pack_LPEXCEPTION_RECORD(void)
+{
+#ifdef __REACTOS__
+    /* PEXCEPTION_RECORD, official. (See ROSTESTS-251.) */
+    TEST_TYPE_SIZE   (PEXCEPTION_RECORD, 4)
+    TEST_TYPE_ALIGN  (PEXCEPTION_RECORD, 4)
+#else
+    /* LPEXCEPTION_RECORD, Wine synonym. */
+    TEST_TYPE_SIZE   (LPEXCEPTION_RECORD, 4)
+    TEST_TYPE_ALIGN  (LPEXCEPTION_RECORD, 4)
+#endif
+}
 
 static void test_pack_LPFIBER_START_ROUTINE(void)
 {
Index: rostests/winetests/kernel32/testlist.c
--- a/rostests/winetests/kernel32/testlist.c
+++ b/rostests/winetests/kernel32/testlist.c
@@ -39,9 +39,6 @@ extern void func_toolhelp(void);
 extern void func_version(void);
 extern void func_virtual(void);
 extern void func_volume(void);
-/* ReactOS */
-extern void func_dosdev(void);
-extern void func_interlck(void);
 
 const struct test winetest_testlist[] =
 {
@@ -51,16 +48,17 @@ const struct test winetest_testlist[] =
     { "codepage", func_codepage },
     { "comm", func_comm },
     { "console", func_console },
-    /* ReactOS */
-    //{ "debugger", func_debugger },
+    { "cpu", func_cpu },
+    /* ReactOS: 3 failures and Testman reports Buildbot troubles (See ROSTESTS-251.):
+    // { "debugger", func_debugger },
+    */
     { "directory", func_directory },
     { "drive", func_drive },
     { "environ", func_environ },
     { "fiber", func_fiber },
     { "file", func_file },
     { "format_msg", func_format_msg },
-    /* ReactOS */
-    //{ "generated", func_generated },
+    { "generated", func_generated },
     { "heap", func_heap },
     { "loader", func_loader },
     { "locale", func_locale },