Author: tfaber
Date: Sat May 5 16:54:37 2012
New Revision: 56513
URL: http://svn.reactos.org/svn/reactos?rev=56513&view=rev
Log:
[WINETESTS]
- Do not multiply define WINVER and friends
- Add missing _WIN32_WINNT define in rpcrt4_winetest. Already sent to Wine(TM)
Modified:
trunk/rostests/winetests/comctl32/CMakeLists.txt
trunk/rostests/winetests/ntdll/CMakeLists.txt
trunk/rostests/winetests/rpcrt4/CMakeLists.txt
trunk/rostests/winetests/rpcrt4/ndr_marshall.c
Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeLists.txt?rev=56513&r1=56512&r2=56513&view=diff
==============================================================================
--- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sat May 5
16:54:37 2012
@@ -1,11 +1,7 @@
+
+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
@@ -42,8 +38,7 @@
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)
Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeLists.txt?rev=56513&r1=56512&r2=56513&view=diff
==============================================================================
--- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Sat May 5
16:54:37 2012
@@ -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
Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLists.txt?rev=56513&r1=56512&r2=56513&view=diff
==============================================================================
--- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Sat May 5
16:54:37 2012
@@ -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 @@
if(NOT MSVC)
add_target_compile_flags(rpcrt4_winetest "-Wno-format")
- allow_warnings(rpcrt4_winetest)
endif()
Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/ndr_marshall.c?rev=56513&r1=56512&r2=56513&view=diff
==============================================================================
--- trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] Sat May 5
16:54:37 2012
@@ -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 */
