Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 11:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINETESTS]

Browse source 
- 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
This commit is contained in:
Thomas Faber 2012-05-05 16:54:37 +00:00
parent 2d7b85a68d
commit 80a53d624f
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rostests/winetests/comctl32/CMakeLists.txt
View file

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

6
rostests/winetests/ntdll/CMakeLists.txt
View file

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

6
rostests/winetests/rpcrt4/CMakeLists.txt
View file

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

1
rostests/winetests/rpcrt4/ndr_marshall.c
View file

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