Author: tfaber Date: Thu Sep 8 10:28:02 2011 New Revision: 53638
URL: http://svn.reactos.org/svn/reactos?rev=53638&view=rev Log: [KMTestSuite] - Sync to rostests r53632
Added: branches/GSoC_2011/KMTestSuite/apitests/user32/SetActiveWindow.c - copied unchanged from r53637, trunk/rostests/apitests/user32/SetActiveWindow.c Modified: branches/GSoC_2011/KMTestSuite/ (props changed) branches/GSoC_2011/KMTestSuite/apitests/user32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/apitests/user32/testlist.c branches/GSoC_2011/KMTestSuite/apitests/user32/user32_apitest.rbuild branches/GSoC_2011/KMTestSuite/tests/pseh2/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/comctl32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/fusion/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/gdi32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/gdi32/metafile.c branches/GSoC_2011/KMTestSuite/winetests/kernel32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/msvcrt/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/ntdll/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/powrprof/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/rpcrt4/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/setupapi/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/shdocvw/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/urlmon/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/user32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/wininet/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/winmm/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/ws2_32/CMakeLists.txt
Propchange: branches/GSoC_2011/KMTestSuite/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 8 10:28:02 2011 @@ -1,1 +1,1 @@ -/trunk/rostests:51165-53563 +/trunk/rostests:51165-53637
Modified: branches/GSoC_2011/KMTestSuite/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/u... ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/user32/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -14,6 +14,7 @@ ScrollDC.c ScrollWindowEx.c SetCursorPos.c + SetActiveWindow.c WndProc.c testlist.c user32_apitest.rc)
Modified: branches/GSoC_2011/KMTestSuite/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/u... ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/user32/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/user32/testlist.c [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -15,6 +15,7 @@ extern void func_DeferWindowPos(void); extern void func_GetKeyState(void); extern void func_SetCursorPos(void); +extern void func_SetActiveWindow(void); extern void func_WndProc(void);
const struct test winetest_testlist[] = @@ -29,6 +30,7 @@ { "DeferWindowPos", func_DeferWindowPos }, { "GetKeyState", func_GetKeyState }, { "SetCursorPos", func_SetCursorPos }, + { "SetActiveWindow", func_SetActiveWindow }, { "WndProc", func_WndProc }, { 0, 0 } };
Modified: branches/GSoC_2011/KMTestSuite/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/u... ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/user32/user32_apitest.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/user32/user32_apitest.rbuild [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -19,6 +19,7 @@ <file>GetIconInfo.c</file> <file>GetPeekMessage.c</file> <file>DeferWindowPos.c</file> + <file>SetActiveWindow.c</file> <file>SetCursorPos.c</file> <file>WndProc.c</file>
Modified: branches/GSoC_2011/KMTestSuite/tests/pseh2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/tests/pseh... ============================================================================== --- branches/GSoC_2011/KMTestSuite/tests/pseh2/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/tests/pseh2/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -6,3 +6,7 @@ set_module_type(pseh2_test win32cui) add_importlibs(pseh2_test msvcrt kernel32 ntdll) add_cd_file(TARGET pseh2_test DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + allow_warnings(pseh2_test) +endif()
Modified: branches/GSoC_2011/KMTestSuite/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/comctl32/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -39,6 +39,8 @@
if(MSVC) target_link_libraries(comctl32_winetest uuid) +else() + allow_warnings(comctl32_winetest) endif()
set_module_type(comctl32_winetest win32cui)
Modified: branches/GSoC_2011/KMTestSuite/winetests/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/fusion/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/fusion/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -15,3 +15,7 @@ set_module_type(fusion_winetest win32cui) add_importlibs(fusion_winetest user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion_winetest DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + allow_warnings(fusion_winetest) +endif()
Modified: branches/GSoC_2011/KMTestSuite/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/gdi32/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
list(APPEND SOURCE bitmap.c
Modified: branches/GSoC_2011/KMTestSuite/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/gdi32/metafile.c [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -1427,14 +1427,15 @@ const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2);
-#if 1 +if(!winetest_interactive) skip("skipping match_emf_record(), bug 5393\n"); -#else +else +{ trace("%s: EMF record %u, size %u/record %u, size %u\n", desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize);
if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; -#endif +}
/* We have already bailed out if iType or nSize don't match */ offset1 += emr1->nSize;
Modified: branches/GSoC_2011/KMTestSuite/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/kernel32/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
set_rc_compiler()
@@ -48,5 +50,8 @@ target_link_libraries(kernel32_winetest wine) set_module_type(kernel32_winetest win32cui) add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) +if(NOT MSVC) + allow_warnings(kernel32_winetest) +endif()
add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all)
Modified: branches/GSoC_2011/KMTestSuite/winetests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -24,6 +24,8 @@
if(MSVC) target_link_libraries(msvcrt_winetest oldnames) +else() + allow_warnings(msvcrt_winetest) endif()
set_module_type(msvcrt_winetest win32cui)
Modified: branches/GSoC_2011/KMTestSuite/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/ntdll/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -29,3 +29,6 @@ set_module_type(ntdll_winetest win32cui) add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll) add_cd_file(TARGET ntdll_winetest DESTINATION reactos/bin FOR all) +if(NOT MSVC) + allow_warnings(ntdll_winetest) +endif()
Modified: branches/GSoC_2011/KMTestSuite/winetests/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/powrprof/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -8,3 +8,7 @@ set_module_type(powrprof_winetest win32cui) add_importlibs(powrprof_winetest advapi32 powrprof msvcrt kernel32 ntdll) add_cd_file(TARGET powrprof_winetest DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + allow_warnings(powrprof_winetest) +endif()
Modified: branches/GSoC_2011/KMTestSuite/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -1,5 +1,6 @@
-remove_definitions(-D_WIN32_WINNT=0x502) +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) + add_definitions(-D_WIN32_WINNT=0x500)
add_definitions( @@ -44,3 +45,7 @@ set_module_type(rpcrt4_winetest win32cui) add_importlibs(rpcrt4_winetest ole32 rpcrt4 msvcrt kernel32 ntdll) add_cd_file(TARGET rpcrt4_winetest DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + allow_warnings(rpcrt4_winetest) +endif()
Modified: branches/GSoC_2011/KMTestSuite/winetests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/setupapi/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -19,3 +19,7 @@ set_module_type(setupapi_winetest win32cui) add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + allow_warnings(setupapi_winetest) +endif()
Modified: branches/GSoC_2011/KMTestSuite/winetests/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/shdocvw/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -15,3 +15,7 @@ set_module_type(shdocvw_winetest win32cui) add_importlibs(shdocvw_winetest gdi32 shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET shdocvw_winetest DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + allow_warnings(shdocvw_winetest) +endif()
Modified: branches/GSoC_2011/KMTestSuite/winetests/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/urlmon/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -1,3 +1,5 @@ + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
add_definitions( -D__ROS_LONG64__
Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/user32/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -38,3 +38,7 @@ set_module_type(user32_winetest win32cui) add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET user32_winetest DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + allow_warnings(user32_winetest) +endif()
Modified: branches/GSoC_2011/KMTestSuite/winetests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/wininet/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/wininet/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -1,3 +1,5 @@ + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
add_definitions( -D__ROS_LONG64__
Modified: branches/GSoC_2011/KMTestSuite/winetests/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/winmm/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/winmm/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -17,3 +17,7 @@ set_module_type(winmm_winetest win32cui) add_importlibs(winmm_winetest winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET winmm_winetest DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + allow_warnings(winmm_winetest) +endif()
Modified: branches/GSoC_2011/KMTestSuite/winetests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests/... ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/ws2_32/CMakeLists.txt [iso-8859-1] Thu Sep 8 10:28:02 2011 @@ -8,3 +8,7 @@ set_module_type(ws2_32_winetest win32cui) add_importlibs(ws2_32_winetest ws2_32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET ws2_32_winetest DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + allow_warnings(ws2_32_winetest) +endif()
-
tfaber＠svn.reactos.org