From f5ce6995175d3a3303270202a0c1f7b6f73466ef Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 22 Dec 2010 16:33:37 +0000 Subject: [PATCH] [CMAKE] - Add the apitests to build. - Improve some winetests. svn path=/trunk/; revision=50100 --- rostests/CMakeLists.txt | 2 +- rostests/apitests/CMakeLists.txt | 14 ++++++ rostests/apitests/dciman32/CMakeLists.txt | 7 +++ rostests/apitests/gdi32/CMakeLists.txt | 49 +++++++++++++++++++ rostests/apitests/ntdll/CMakeLists.txt | 18 +++++++ rostests/apitests/user32/CMakeLists.txt | 15 ++++++ rostests/apitests/w32kdll/CMakeLists.txt | 6 +++ .../w32kdll/w32kdll_2k3sp2/CMakeLists.txt | 6 +++ .../w32kdll/w32kdll_2ksp4/CMakeLists.txt | 6 +++ .../w32kdll/w32kdll_ros/CMakeLists.txt | 11 +++++ .../w32kdll/w32kdll_vista/CMakeLists.txt | 6 +++ .../w32kdll/w32kdll_xpsp2/CMakeLists.txt | 6 +++ rostests/apitests/w32knapi/CMakeLists.txt | 13 +++++ rostests/apitests/ws2_32/CMakeLists.txt | 13 +++++ rostests/winetests/amstream/CMakeLists.txt | 1 + rostests/winetests/powrprof/CMakeLists.txt | 2 +- 16 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 rostests/apitests/CMakeLists.txt create mode 100644 rostests/apitests/dciman32/CMakeLists.txt create mode 100644 rostests/apitests/gdi32/CMakeLists.txt create mode 100644 rostests/apitests/ntdll/CMakeLists.txt create mode 100644 rostests/apitests/user32/CMakeLists.txt create mode 100644 rostests/apitests/w32kdll/CMakeLists.txt create mode 100644 rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt create mode 100644 rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt create mode 100644 rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt create mode 100644 rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt create mode 100644 rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt create mode 100644 rostests/apitests/w32knapi/CMakeLists.txt create mode 100644 rostests/apitests/ws2_32/CMakeLists.txt diff --git a/rostests/CMakeLists.txt b/rostests/CMakeLists.txt index b926010d908..8ce0db3ba37 100644 --- a/rostests/CMakeLists.txt +++ b/rostests/CMakeLists.txt @@ -1,5 +1,5 @@ -#add_subdirectory(apitests) +add_subdirectory(apitests) #add_subdirectory(dibtests) #add_subdirectory(dxtest) #add_subdirectory(regtests) diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt new file mode 100644 index 00000000000..6b0ac2d0bc2 --- /dev/null +++ b/rostests/apitests/CMakeLists.txt @@ -0,0 +1,14 @@ + +add_library(apitest apitest.c) + +add_subdirectory(dciman32) +add_subdirectory(gdi32) +#add_subdirectory(ntdll) The asm file needs to be fixed. +add_subdirectory(user32) + +if(ARCH MATCHES i386) +add_subdirectory(w32kdll) +add_subdirectory(w32knapi) +endif() + +add_subdirectory(ws2_32) diff --git a/rostests/apitests/dciman32/CMakeLists.txt b/rostests/apitests/dciman32/CMakeLists.txt new file mode 100644 index 00000000000..552e51d5e8b --- /dev/null +++ b/rostests/apitests/dciman32/CMakeLists.txt @@ -0,0 +1,7 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +add_executable(dciman32_apitest DCICreatePrimary.c testlist.c) +target_link_libraries(dciman32_apitest wine) +set_module_type(dciman32_apitest win32cui) +add_importlibs(dciman32_apitest msvcrt kernel32 ntdll) diff --git a/rostests/apitests/gdi32/CMakeLists.txt b/rostests/apitests/gdi32/CMakeLists.txt new file mode 100644 index 00000000000..969eba3cd39 --- /dev/null +++ b/rostests/apitests/gdi32/CMakeLists.txt @@ -0,0 +1,49 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + AddFontResource.c + AddFontResourceEx.c + BeginPath.c + CreateBitmapIndirect.c + CreateCompatibleDC.c + CreateFont.c + CreateFontIndirect.c + CreatePen.c + CreateRectRgn.c + EngAcquireSemaphore.c + EngCreateSemaphore.c + EngDeleteSemaphore.c + EngReleaseSemaphore.c + ExtCreatePen.c + GdiConvertBitmap.c + GdiConvertBrush.c + GdiConvertDC.c + GdiConvertFont.c + GdiConvertPalette.c + GdiConvertRegion.c + GdiDeleteLocalDC.c + GdiGetCharDimensions.c + GdiGetLocalBrush.c + GdiGetLocalDC.c + GdiReleaseLocalDC.c + GdiSetAttrs.c + GetClipRgn.c + GetCurrentObject.c + GetDIBits.c + GetObject.c + GetStockObject.c + GetTextExtentExPoint.c + GetTextFace.c + SelectObject.c + SetDCPenColor.c + SetMapMode.c + SetSysColors.c + SetWindowExtEx.c + SetWorldTransform.c + testlist.c) + +add_executable(gdi32_apitest ${SOURCE}) +target_link_libraries(gdi32_apitest wine ${PSEH_LIB}) +set_module_type(gdi32_apitest win32cui) +add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) diff --git a/rostests/apitests/ntdll/CMakeLists.txt b/rostests/apitests/ntdll/CMakeLists.txt new file mode 100644 index 00000000000..2b6d4934e48 --- /dev/null +++ b/rostests/apitests/ntdll/CMakeLists.txt @@ -0,0 +1,18 @@ + +#add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + RtlInitializeBitMap.c + ZwContinue.c + testlist.c) + +if(ARCH MATCHES i386) +list(APPEND SOURCE i386/ZwContinue.asm) +endif() + +add_executable(ntdll_apitest ${SOURCE}) +target_link_libraries(ntdll_apitest wine + #${PSEH_LIB} + ) +set_module_type(ntdll_apitest win32cui) +add_importlibs(ntdll_apitest ntdll) diff --git a/rostests/apitests/user32/CMakeLists.txt b/rostests/apitests/user32/CMakeLists.txt new file mode 100644 index 00000000000..2ae9ea1c144 --- /dev/null +++ b/rostests/apitests/user32/CMakeLists.txt @@ -0,0 +1,15 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + InitializeLpkHooks.c + RealGetWindowClass.c + ScrollDC.c + ScrollWindowEx.c + GetSystemMetrics.c + testlist.c) + +add_executable(user32_apitest ${SOURCE}) +target_link_libraries(user32_apitest wine) +set_module_type(user32_apitest win32cui) +add_importlibs(user32_apitest gdi32 user32 msvcrt kernel32 ntdll) diff --git a/rostests/apitests/w32kdll/CMakeLists.txt b/rostests/apitests/w32kdll/CMakeLists.txt new file mode 100644 index 00000000000..a2c1b14f249 --- /dev/null +++ b/rostests/apitests/w32kdll/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_subdirectory(w32kdll_ros) +add_subdirectory(w32kdll_xpsp2) +add_subdirectory(w32kdll_2ksp4) +add_subdirectory(w32kdll_2k3sp2) +add_subdirectory(w32kdll_vista) diff --git a/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt new file mode 100644 index 00000000000..ead3b82f1bf --- /dev/null +++ b/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_library(w32kdll_2k3sp2 SHARED main.c w32kdll_2k3sp2.S) +set_entrypoint(w32kdll_2k3sp2 0) +target_link_libraries(w32kdll_2k3sp2 ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_2k3sp2.def) +add_dependencies(w32kdll_2k3sp2 psdk buildno_header) +add_importlib_target(w32kdll_2k3sp2.def) diff --git a/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt new file mode 100644 index 00000000000..efc4ec0ad68 --- /dev/null +++ b/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_library(w32kdll_2ksp4 SHARED main.c w32kdll_2ksp4.S) +set_entrypoint(w32kdll_2ksp4 0) +target_link_libraries(w32kdll_2ksp4 ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_2ksp4.def) +add_dependencies(w32kdll_2ksp4 psdk buildno_header) +add_importlib_target(w32kdll_2ksp4.def) diff --git a/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt new file mode 100644 index 00000000000..ad143fee275 --- /dev/null +++ b/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt @@ -0,0 +1,11 @@ + +add_library(w32kdll SHARED main.c) + +set_entrypoint(w32kdll 0) + +target_link_libraries(w32kdll + ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_ros.def + win32ksys) + +add_dependencies(w32kdll psdk buildno_header) +add_importlib_target(w32kdll_ros.def) diff --git a/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt new file mode 100644 index 00000000000..5c387435e80 --- /dev/null +++ b/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_library(w32kdll_vista SHARED main.c w32kdll_vista.S) +set_entrypoint(w32kdll_vista 0) +target_link_libraries(w32kdll_vista ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_vista.def) +add_dependencies(w32kdll_vista psdk buildno_header) +add_importlib_target(w32kdll_vista.def) diff --git a/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt new file mode 100644 index 00000000000..3f86810f2c6 --- /dev/null +++ b/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_library(w32kdll_xpsp2 SHARED main.c w32kdll_xpsp2.S) +set_entrypoint(w32kdll_xpsp2 0) +target_link_libraries(w32kdll_xpsp2 ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_xpsp2.def) +add_dependencies(w32kdll_xpsp2 psdk buildno_header) +add_importlib_target(w32kdll_xpsp2.def) diff --git a/rostests/apitests/w32knapi/CMakeLists.txt b/rostests/apitests/w32knapi/CMakeLists.txt new file mode 100644 index 00000000000..21e1e5fd0c1 --- /dev/null +++ b/rostests/apitests/w32knapi/CMakeLists.txt @@ -0,0 +1,13 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + osver.c + testlist.c + w32knapi.c + w32knapi.rc) + +add_executable(w32knapi ${SOURCE}) +target_link_libraries(w32knapi apitest) +set_module_type(w32knapi win32cui) +add_importlibs(w32knapi w32kdll_ros gdi32 user32 shell32 advapi32 msvcrt kernel32 ntdll) diff --git a/rostests/apitests/ws2_32/CMakeLists.txt b/rostests/apitests/ws2_32/CMakeLists.txt new file mode 100644 index 00000000000..ba9da9c84c0 --- /dev/null +++ b/rostests/apitests/ws2_32/CMakeLists.txt @@ -0,0 +1,13 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + helpers.c + ioctlsocket.c + recv.c + testlist.c) + +add_executable(ws2_32_apitest ${SOURCE}) +target_link_libraries(ws2_32_apitest wine) +set_module_type(ws2_32_apitest win32cui) +add_importlibs(ws2_32_apitest ws2_32 msvcrt kernel32 ntdll) diff --git a/rostests/winetests/amstream/CMakeLists.txt b/rostests/winetests/amstream/CMakeLists.txt index e861c17aa1b..a23adfa6c8f 100644 --- a/rostests/winetests/amstream/CMakeLists.txt +++ b/rostests/winetests/amstream/CMakeLists.txt @@ -4,3 +4,4 @@ add_executable(amstream_winetest amstream.c testlist.c) target_link_libraries(amstream_winetest wine uuid) set_module_type(amstream_winetest win32cui) add_importlibs(amstream_winetest ole32 user32 ddraw msvcrt kernel32 ntdll) +add_dependencies(amstream_winetest dxsdk) \ No newline at end of file diff --git a/rostests/winetests/powrprof/CMakeLists.txt b/rostests/winetests/powrprof/CMakeLists.txt index fec0f4ac793..462da098510 100644 --- a/rostests/winetests/powrprof/CMakeLists.txt +++ b/rostests/winetests/powrprof/CMakeLists.txt @@ -6,4 +6,4 @@ add_definitions( add_executable(powrprof_winetest pwrprof.c testlist.c) set_module_type(powrprof_winetest win32cui) -add_importlibs(powrprof_winetest advapi32 pwrprof msvcrt kernel32 ntdll) +add_importlibs(powrprof_winetest advapi32 powrprof msvcrt kernel32 ntdll)