[WINETESTS]

- Do not multiply define WINVER and friends
- Add missing _WIN32_WINNT define in rpcrt4_winetest. Already sent to Wine(TM)

svn path=/trunk/; revision=56513

rostests/winetests/comctl32/CMakeLists.txt

@@ -1,12 +1,8 @@
 
+remove_definitions(-D_WIN32_WINNT=0x502 -D_WIN32_IE=0x600)
+
 add_definitions(-D__ROS_LONG64__)
 
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
-
-remove_definitions(-D_WIN32_IE=0x600)
-add_definitions(-D_WIN32_IE=0x500)
-
 list(APPEND SOURCE
     comboex.c
     datetime.c
@@ -42,8 +38,7 @@ if(MSVC)
 else()
     # FIXME: http://www.cmake.org/Bug/view.php?id=12998
     #add_target_compile_flags(comctl32_winetest "-Wno-format")
-    #allow_warnings(comctl32_winetest)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-error")
+    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format")
 endif()
 
 set_module_type(comctl32_winetest win32cui)

rostests/winetests/ntdll/CMakeLists.txt

@@ -1,7 +1,7 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
+remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
+
+add_definitions(-D__ROS_LONG64__)
 
 list(APPEND SOURCE
     atom.c

rostests/winetests/rpcrt4/CMakeLists.txt

@@ -1,10 +1,7 @@
 
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 
-add_definitions(-D_WIN32_WINNT=0x500)
-
-add_definitions(
-    -D__ROS_LONG64__)
+add_definitions(-D__ROS_LONG64__)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
     
@@ -47,5 +44,4 @@ add_cd_file(TARGET rpcrt4_winetest DESTINATION reactos/bin FOR all)
 
 if(NOT MSVC)
     add_target_compile_flags(rpcrt4_winetest "-Wno-format")
-    allow_warnings(rpcrt4_winetest)
 endif()

rostests/winetests/rpcrt4/ndr_marshall.c

@@ -20,6 +20,7 @@
 
 #include <stdarg.h>
 
+#define _WIN32_WINNT  0x0500
 #define NTDDI_WIN2K   0x05000000
 #define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */