Author: akhaldi Date: Wed Dec 22 16:33:37 2010 New Revision: 50100
URL: http://svn.reactos.org/svn/reactos?rev=50100&view=rev Log: [CMAKE] - Add the apitests to build. - Improve some winetests.
Added: trunk/rostests/apitests/CMakeLists.txt (with props) trunk/rostests/apitests/dciman32/CMakeLists.txt (with props) trunk/rostests/apitests/gdi32/CMakeLists.txt (with props) trunk/rostests/apitests/ntdll/CMakeLists.txt (with props) trunk/rostests/apitests/user32/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt (with props) trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt (with props) trunk/rostests/apitests/w32knapi/CMakeLists.txt (with props) trunk/rostests/apitests/ws2_32/CMakeLists.txt (with props) Modified: trunk/rostests/CMakeLists.txt trunk/rostests/winetests/amstream/CMakeLists.txt trunk/rostests/winetests/powrprof/CMakeLists.txt
Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=50100&a... ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,5 +1,5 @@
-#add_subdirectory(apitests) +add_subdirectory(apitests) #add_subdirectory(dibtests) #add_subdirectory(dxtest) #add_subdirectory(regtests)
Added: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?re... ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt (added) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/CMakeLis... ============================================================================== --- trunk/rostests/apitests/dciman32/CMakeLists.txt (added) +++ trunk/rostests/apitests/dciman32/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/dciman32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists.... ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt (added) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/gdi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists.... ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt (added) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/ntdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeLists... ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt (added) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/user32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/w32kdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/CMakeList... ============================================================================== --- trunk/rostests/apitests/w32kdll/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,0 +1,6 @@ + +add_subdirectory(w32kdll_ros) +add_subdirectory(w32kdll_xpsp2) +add_subdirectory(w32kdll_2ksp4) +add_subdirectory(w32kdll_2k3sp2) +add_subdirectory(w32kdll_vista)
Propchange: trunk/rostests/apitests/w32kdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_2... ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_2... ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_r... ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_v... ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_x... ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/w32knapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/CMakeLis... ============================================================================== --- trunk/rostests/apitests/w32knapi/CMakeLists.txt (added) +++ trunk/rostests/apitests/w32knapi/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/w32knapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeLists... ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt (added) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -1,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)
Propchange: trunk/rostests/apitests/ws2_32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/rostests/winetests/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/CMakeLi... ============================================================================== --- trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -4,3 +4,4 @@ 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)
Modified: trunk/rostests/winetests/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/CMakeLi... ============================================================================== --- trunk/rostests/winetests/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/powrprof/CMakeLists.txt [iso-8859-1] Wed Dec 22 16:33:37 2010 @@ -6,4 +6,4 @@
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)
-
akhaldi＠svn.reactos.org