From dd21fa115a596cbf0c8565e8e9db919acfaa8c6b Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Sun, 28 Feb 2016 20:56:00 +0000 Subject: [PATCH] [ROSTESTS] Handle generated tests on all architectures. Update i386 files. The kernel32 generated remains disabled, Wine's definition of COMMCONFIG differs from our/MSDN definition. Commented out nonexisting LPEXCEPTION_RECORD. svn path=/trunk/; revision=70802 --- rostests/winetests/gdi32/CMakeLists.txt | 5 +--- .../gdi32/{generated.c => generated_i386.c} | 0 rostests/winetests/kernel32/CMakeLists.txt | 5 +--- .../{generated.c => generated_i386.c} | 24 +++++++++---------- rostests/winetests/ntdll/CMakeLists.txt | 5 +--- .../ntdll/{generated.c => generated_i386.c} | 0 rostests/winetests/rpcrt4/CMakeLists.txt | 2 +- .../rpcrt4/{generated.c => generated_i386.c} | 1 + rostests/winetests/shell32/CMakeLists.txt | 5 +--- .../shell32/{generated.c => generated_i386.c} | 0 rostests/winetests/shlwapi/CMakeLists.txt | 2 +- .../shlwapi/{generated.c => generated_i386.c} | 0 rostests/winetests/urlmon/CMakeLists.txt | 5 +--- .../urlmon/{generated.c => generated_i386.c} | 0 rostests/winetests/user32/CMakeLists.txt | 7 ++---- .../user32/{generated.c => generated_i386.c} | 0 rostests/winetests/user32/testlist.c | 4 ++-- rostests/winetests/wininet/CMakeLists.txt | 5 +--- .../wininet/{generated.c => generated_i386.c} | 0 19 files changed, 25 insertions(+), 45 deletions(-) rename rostests/winetests/gdi32/{generated.c => generated_i386.c} (100%) rename rostests/winetests/kernel32/{generated.c => generated_i386.c} (99%) rename rostests/winetests/ntdll/{generated.c => generated_i386.c} (100%) rename rostests/winetests/rpcrt4/{generated.c => generated_i386.c} (99%) rename rostests/winetests/shell32/{generated.c => generated_i386.c} (100%) rename rostests/winetests/shlwapi/{generated.c => generated_i386.c} (100%) rename rostests/winetests/urlmon/{generated.c => generated_i386.c} (100%) rename rostests/winetests/user32/{generated.c => generated_i386.c} (100%) rename rostests/winetests/wininet/{generated.c => generated_i386.c} (100%) diff --git a/rostests/winetests/gdi32/CMakeLists.txt b/rostests/winetests/gdi32/CMakeLists.txt index 033f6581773..ec6bf16facf 100644 --- a/rostests/winetests/gdi32/CMakeLists.txt +++ b/rostests/winetests/gdi32/CMakeLists.txt @@ -9,6 +9,7 @@ list(APPEND SOURCE dib.c font.c gdiobj.c + generated_${ARCH}.c icm.c mapping.c metafile.c @@ -17,10 +18,6 @@ list(APPEND SOURCE pen.c testlist.c) -if(ARCH STREQUAL "i386") - list(APPEND SOURCE generated.c) -endif() - add_executable(gdi32_winetest ${SOURCE} resource.rc) set_module_type(gdi32_winetest win32cui) add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32) diff --git a/rostests/winetests/gdi32/generated.c b/rostests/winetests/gdi32/generated_i386.c similarity index 100% rename from rostests/winetests/gdi32/generated.c rename to rostests/winetests/gdi32/generated_i386.c diff --git a/rostests/winetests/kernel32/CMakeLists.txt b/rostests/winetests/kernel32/CMakeLists.txt index 53fd02c8db7..5e14986d38e 100644 --- a/rostests/winetests/kernel32/CMakeLists.txt +++ b/rostests/winetests/kernel32/CMakeLists.txt @@ -17,6 +17,7 @@ list(APPEND SOURCE fiber.c file.c format_msg.c + #generated_${ARCH}.c heap.c loader.c locale.c @@ -37,10 +38,6 @@ list(APPEND SOURCE volume.c testlist.c) -#if(ARCH STREQUAL "i386") -# list(APPEND SOURCE generated.c) -#endif() - add_executable(kernel32_winetest ${SOURCE} resource.rc) if(NOT MSVC) diff --git a/rostests/winetests/kernel32/generated.c b/rostests/winetests/kernel32/generated_i386.c similarity index 99% rename from rostests/winetests/kernel32/generated.c rename to rostests/winetests/kernel32/generated_i386.c index 36053b84916..3a1007094b4 100644 --- a/rostests/winetests/kernel32/generated.c +++ b/rostests/winetests/kernel32/generated_i386.c @@ -989,12 +989,12 @@ 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) +//{ +// /* LPEXCEPTION_RECORD */ +// TEST_TYPE_SIZE (LPEXCEPTION_RECORD, 8) +// TEST_TYPE_ALIGN (LPEXCEPTION_RECORD, 8) +//} static void test_pack_LPFIBER_START_ROUTINE(void) { @@ -2846,12 +2846,12 @@ 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) +//{ +// /* LPEXCEPTION_RECORD */ +// TEST_TYPE_SIZE (LPEXCEPTION_RECORD, 4) +// TEST_TYPE_ALIGN (LPEXCEPTION_RECORD, 4) +//} static void test_pack_LPFIBER_START_ROUTINE(void) { diff --git a/rostests/winetests/ntdll/CMakeLists.txt b/rostests/winetests/ntdll/CMakeLists.txt index 1c891d3aab3..c786e38edbc 100644 --- a/rostests/winetests/ntdll/CMakeLists.txt +++ b/rostests/winetests/ntdll/CMakeLists.txt @@ -11,6 +11,7 @@ list(APPEND SOURCE error.c exception.c file.c + generated_${ARCH}.c info.c large_int.c om.c @@ -25,10 +26,6 @@ list(APPEND SOURCE time.c testlist.c) -if(ARCH STREQUAL "i386") - list(APPEND SOURCE generated.c) -endif() - add_executable(ntdll_winetest ${SOURCE}) set_module_type(ntdll_winetest win32cui) add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll) diff --git a/rostests/winetests/ntdll/generated.c b/rostests/winetests/ntdll/generated_i386.c similarity index 100% rename from rostests/winetests/ntdll/generated.c rename to rostests/winetests/ntdll/generated_i386.c diff --git a/rostests/winetests/rpcrt4/CMakeLists.txt b/rostests/winetests/rpcrt4/CMakeLists.txt index f2b11444099..e2e971fa1b7 100644 --- a/rostests/winetests/rpcrt4/CMakeLists.txt +++ b/rostests/winetests/rpcrt4/CMakeLists.txt @@ -10,7 +10,7 @@ unset(IDL_FLAGS) list(APPEND SOURCE cstub.c - generated.c + generated_${ARCH}.c ndr_marshall.c rpc.c rpc_async.c diff --git a/rostests/winetests/rpcrt4/generated.c b/rostests/winetests/rpcrt4/generated_i386.c similarity index 99% rename from rostests/winetests/rpcrt4/generated.c rename to rostests/winetests/rpcrt4/generated_i386.c index 4b9d16cba07..7eb8faa0731 100644 --- a/rostests/winetests/rpcrt4/generated.c +++ b/rostests/winetests/rpcrt4/generated_i386.c @@ -14,6 +14,7 @@ #include #include "windef.h" #include "winbase.h" +#include "ole2.h" #include "rpc.h" #include "rpcndr.h" #include "rpcproxy.h" diff --git a/rostests/winetests/shell32/CMakeLists.txt b/rostests/winetests/shell32/CMakeLists.txt index e9009fc6083..16b629421a4 100644 --- a/rostests/winetests/shell32/CMakeLists.txt +++ b/rostests/winetests/shell32/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE autocomplete.c brsfolder.c ebrowser.c + generated_${ARCH}.c progman_dde.c recyclebin.c shelldispatch.c @@ -23,10 +24,6 @@ list(APPEND SOURCE testlist.c rsrc.rc) -if(ARCH STREQUAL "i386") - list(APPEND SOURCE generated.c) -endif() - add_executable(shell32_winetest ${SOURCE}) target_link_libraries(shell32_winetest uuid) set_module_type(shell32_winetest win32cui) diff --git a/rostests/winetests/shell32/generated.c b/rostests/winetests/shell32/generated_i386.c similarity index 100% rename from rostests/winetests/shell32/generated.c rename to rostests/winetests/shell32/generated_i386.c diff --git a/rostests/winetests/shlwapi/CMakeLists.txt b/rostests/winetests/shlwapi/CMakeLists.txt index 400cba13bcf..8fdeee24757 100644 --- a/rostests/winetests/shlwapi/CMakeLists.txt +++ b/rostests/winetests/shlwapi/CMakeLists.txt @@ -5,7 +5,7 @@ list(APPEND SOURCE assoc.c clist.c clsid.c - generated.c + generated_${ARCH}.c istream.c ordinal.c path.c diff --git a/rostests/winetests/shlwapi/generated.c b/rostests/winetests/shlwapi/generated_i386.c similarity index 100% rename from rostests/winetests/shlwapi/generated.c rename to rostests/winetests/shlwapi/generated_i386.c diff --git a/rostests/winetests/urlmon/CMakeLists.txt b/rostests/winetests/urlmon/CMakeLists.txt index b7773c82e9e..8d6c43ec228 100644 --- a/rostests/winetests/urlmon/CMakeLists.txt +++ b/rostests/winetests/urlmon/CMakeLists.txt @@ -2,6 +2,7 @@ add_definitions(-DUSE_WINE_TODOS) list(APPEND SOURCE + generated_${ARCH}.c misc.c protocol.c sec_mgr.c @@ -10,10 +11,6 @@ list(APPEND SOURCE url.c testlist.c) -if(ARCH STREQUAL "i386") - list(APPEND SOURCE generated.c) -endif() - add_executable(urlmon_winetest ${SOURCE}) target_link_libraries(urlmon_winetest uuid) set_module_type(urlmon_winetest win32cui) diff --git a/rostests/winetests/urlmon/generated.c b/rostests/winetests/urlmon/generated_i386.c similarity index 100% rename from rostests/winetests/urlmon/generated.c rename to rostests/winetests/urlmon/generated_i386.c diff --git a/rostests/winetests/user32/CMakeLists.txt b/rostests/winetests/user32/CMakeLists.txt index 15f1c1e1566..cb133a08c5e 100644 --- a/rostests/winetests/user32/CMakeLists.txt +++ b/rostests/winetests/user32/CMakeLists.txt @@ -8,7 +8,8 @@ list(APPEND SOURCE dce.c dde.c dialog.c - edit.c + edit.c + generated_${ARCH}.c input.c listbox.c menu.c @@ -25,10 +26,6 @@ list(APPEND SOURCE wsprintf.c testlist.c) -if(ARCH STREQUAL "i386") - list(APPEND SOURCE generated.c) -endif() - add_executable(user32_winetest ${SOURCE} resource.rc) # some tests need to be run from an app compiled as GUI set_module_type(user32_winetest win32gui) diff --git a/rostests/winetests/user32/generated.c b/rostests/winetests/user32/generated_i386.c similarity index 100% rename from rostests/winetests/user32/generated.c rename to rostests/winetests/user32/generated_i386.c diff --git a/rostests/winetests/user32/testlist.c b/rostests/winetests/user32/testlist.c index f35ee62f8c4..3923a38612c 100644 --- a/rostests/winetests/user32/testlist.c +++ b/rostests/winetests/user32/testlist.c @@ -12,7 +12,7 @@ extern void func_dce(void); extern void func_dde(void); extern void func_dialog(void); extern void func_edit(void); -extern void func_generated(void); +//extern void func_generated(void); extern void func_input(void); extern void func_listbox(void); extern void func_menu(void); @@ -53,7 +53,7 @@ const struct test winetest_testlist[] = { "dde", func_dde }, { "dialog", func_dialog }, { "edit", func_edit }, - { "generated", func_generated }, + //{ "generated", func_generated }, { "input", func_input }, { "listbox", func_listbox }, { "menu", func_menu }, diff --git a/rostests/winetests/wininet/CMakeLists.txt b/rostests/winetests/wininet/CMakeLists.txt index 444f60b25e5..7756a0f5df9 100644 --- a/rostests/winetests/wininet/CMakeLists.txt +++ b/rostests/winetests/wininet/CMakeLists.txt @@ -3,16 +3,13 @@ add_definitions(-DUSE_WINE_TODOS) list(APPEND SOURCE ftp.c + generated_${ARCH}.c http.c internet.c url.c urlcache.c testlist.c) -if(ARCH STREQUAL "i386") - list(APPEND SOURCE generated.c) -endif() - add_executable(wininet_winetest ${SOURCE}) set_module_type(wininet_winetest win32cui) add_importlibs(wininet_winetest wininet crypt32 ws2_32 user32 advapi32 msvcrt kernel32) diff --git a/rostests/winetests/wininet/generated.c b/rostests/winetests/wininet/generated_i386.c similarity index 100% rename from rostests/winetests/wininet/generated.c rename to rostests/winetests/wininet/generated_i386.c