Skip to content

Commit 063c818

Browse files
committed
[MSVCRT_WINETEST] Sync to wine-10.0
1 parent 736fea6 commit 063c818

File tree

13 files changed

+3694
-1659
lines changed

13 files changed

+3694
-1659
lines changed

modules/rostests/winetests/msvcrt/CMakeLists.txt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
3+
24
list(APPEND SOURCE
35
cpp.c
46
data.c
@@ -15,7 +17,7 @@ list(APPEND SOURCE
1517
time.c)
1618

1719
list(APPEND PCH_SKIP_SOURCE
18-
printf.c # _CRT_NON_CONFORMING_SWPRINTFS
20+
printf.c
1921
testlist.c)
2022

2123
add_executable(msvcrt_winetest
@@ -25,6 +27,8 @@ add_executable(msvcrt_winetest
2527
target_compile_definitions(msvcrt_winetest PRIVATE
2628
WINETEST_USE_DBGSTR_LONGLONG
2729
_CRT_NONSTDC_NO_DEPRECATE
30+
_USE_MATH_DEFINES
31+
WIN32_NO_STATUS=
2832
__msvcrt_ulong=ULONG)
2933

3034
if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
@@ -34,13 +38,14 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
3438
endif()
3539
endif()
3640

37-
set_module_type(msvcrt_winetest win32cui)
38-
add_importlibs(msvcrt_winetest advapi32 msvcrt kernel32)
39-
target_link_libraries(msvcrt_winetest oldnames)
40-
4141
if(MSVC)
42-
add_importlibs(msvcrt_winetest ntdll)
42+
# 'swscanf' : unknown type field character '\xe1' in format specifier
43+
target_compile_options(msvcrt_winetest PRIVATE /wd4476)
4344
endif()
4445

46+
set_module_type(msvcrt_winetest win32cui)
47+
add_importlibs(msvcrt_winetest advapi32 msvcrt kernel32 ntdll)
48+
target_link_libraries(msvcrt_winetest oldnames)
49+
4550
add_pch(msvcrt_winetest precomp.h "${PCH_SKIP_SOURCE}")
4651
add_rostests_file(TARGET msvcrt_winetest)

0 commit comments

Comments
 (0)