[CMAKE] Remove obsolete remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)

2026-06-09 01:12:59 +08:00 · 2026-02-23 18:29:31 +02:00
parent b13e568d99
commit d2dc9355ab
23 changed files with 5 additions and 33 deletions
--- a/base/system/msiexec/CMakeLists.txt
+++ b/base/system/msiexec/CMakeLists.txt
@@ -1,6 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 list(APPEND SOURCE
    msiexec.c
    service.c
--- a/dll/win32/combase/CMakeLists.txt
+++ b/dll/win32/combase/CMakeLists.txt
@@ -1,5 +1,5 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS -D_WIN32_WINNT=0x502)
+remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)

--- a/dll/win32/coml2/CMakeLists.txt
+++ b/dll/win32/coml2/CMakeLists.txt
@@ -1,5 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine)
 spec2def(coml2.dll coml2.spec ADD_IMPORTLIB)

--- a/dll/win32/msi/CMakeLists.txt
+++ b/dll/win32/msi/CMakeLists.txt
@@ -1,5 +1,5 @@

-remove_definitions(-D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS)
+remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

 add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T)
--- a/dll/win32/msvcrt/CMakeLists.txt
+++ b/dll/win32/msvcrt/CMakeLists.txt
@@ -3,9 +3,6 @@
 # Global compile options
 ###############################################################################

-# Use conforming swprintfs
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 # This requires NT6
 remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
 add_definitions(-D_WIN32_WINNT=0x601 -DWINVER=0x601)
--- a/dll/win32/ole32/CMakeLists.txt
+++ b/dll/win32/ole32/CMakeLists.txt
@@ -1,5 +1,5 @@

-remove_definitions(-D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS)
+remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

 add_definitions(
--- a/dll/win32/propsys/CMakeLists.txt
+++ b/dll/win32/propsys/CMakeLists.txt
@@ -1,5 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 add_definitions(-D_PROPSYS_)
 spec2def(propsys.dll propsys.spec ADD_IMPORTLIB)

--- a/dll/win32/riched20/CMakeLists.txt
+++ b/dll/win32/riched20/CMakeLists.txt
@@ -1,5 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 spec2def(riched20.dll riched20.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
--- a/dll/win32/ucrtbase/CMakeLists.txt
+++ b/dll/win32/ucrtbase/CMakeLists.txt
@@ -7,8 +7,6 @@ list(REMOVE_ITEM INCLUDE_DIRS "${REACTOS_SOURCE_DIR}/sdk/include/crt")
 set_property(DIRECTORY . PROPERTY INCLUDE_DIRECTORIES ${INCLUDE_DIRS})
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/ucrt)

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 add_compile_definitions(
    _UCRT
    _CORECRT_BUILD
--- a/dll/win32/windowscodecs/CMakeLists.txt
+++ b/dll/win32/windowscodecs/CMakeLists.txt
@@ -5,7 +5,6 @@ add_definitions(
    -DWINE_REGISTER_DLL)

 remove_definitions(-D_WIN32_WINNT=0x502)
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 add_definitions(-D_WIN32_WINNT=0x600)

 include_directories(
--- a/dll/win32/winhttp/CMakeLists.txt
+++ b/dll/win32/winhttp/CMakeLists.txt
@@ -1,5 +1,5 @@

-remove_definitions(-D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS)
+remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

 add_definitions(
--- a/dll/win32/wintrust/CMakeLists.txt
+++ b/dll/win32/wintrust/CMakeLists.txt
@@ -1,6 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB)

 list(APPEND SOURCE
--- a/modules/rosapps/applications/fraginator/CMakeLists.txt
+++ b/modules/rosapps/applications/fraginator/CMakeLists.txt
@@ -1,6 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 list(APPEND SOURCE
 	Fraginator.cpp
 	MainDialog.cpp
--- a/modules/rostests/winetests/combase/CMakeLists.txt
+++ b/modules/rostests/winetests/combase/CMakeLists.txt
@@ -1,7 +1,6 @@

 add_definitions(-D__ROS_LONG64__)
 add_definitions(-DUSE_WINE_TODOS)
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)

 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 spec2def(wine.combase.test.dll wine.combase.test.spec)
--- a/modules/rostests/winetests/kernel32/CMakeLists.txt
+++ b/modules/rostests/winetests/kernel32/CMakeLists.txt
@@ -1,6 +1,6 @@

 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
-remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502 -D_CRT_NON_CONFORMING_SWPRINTFS)
+remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 add_definitions(-DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000007)

 # Comment this block out if you want to debug the heap issue with these tests on ROS x64. ROSTESTS-415
--- a/modules/rostests/winetests/mscoree/CMakeLists.txt
+++ b/modules/rostests/winetests/mscoree/CMakeLists.txt
@@ -1,5 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 add_definitions(-DUSE_WINE_TODOS)

 add_executable(mscoree_winetest
--- a/modules/rostests/winetests/msvcrt/CMakeLists.txt
+++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt
@@ -1,6 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 list(APPEND SOURCE
    cpp.c
    data.c
--- a/modules/rostests/winetests/msxml4/CMakeLists.txt
+++ b/modules/rostests/winetests/msxml4/CMakeLists.txt
@@ -1,6 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 add_definitions(-DUSE_WINE_TODOS)

 list(APPEND SOURCE
--- a/modules/rostests/winetests/msxml6/CMakeLists.txt
+++ b/modules/rostests/winetests/msxml6/CMakeLists.txt
@@ -1,6 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 add_definitions(-DUSE_WINE_TODOS)

 list(APPEND SOURCE
--- a/modules/rostests/winetests/ntdll/CMakeLists.txt
+++ b/modules/rostests/winetests/ntdll/CMakeLists.txt
@@ -1,6 +1,5 @@

 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 add_definitions(-D__WINESRC__ -DWINETEST_USE_DBGSTR_LONGLONG)

 remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
--- a/modules/rostests/winetests/uiautomationcore/CMakeLists.txt
+++ b/modules/rostests/winetests/uiautomationcore/CMakeLists.txt
@@ -1,5 +1,4 @@

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)

--- a/modules/rostests/winetests/user32/CMakeLists.txt
+++ b/modules/rostests/winetests/user32/CMakeLists.txt
@@ -2,8 +2,6 @@
 remove_definitions(-DWINVER=0x502 -D_WIN32_WINNT=0x502)
 add_definitions(-DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00 -DNTDDI_VERSION=0x0A000005)

-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)
-
 list(APPEND SOURCE
    broadcast.c
    class.c
--- a/modules/rostests/winetests/winhttp/CMakeLists.txt
+++ b/modules/rostests/winetests/winhttp/CMakeLists.txt
@@ -1,6 +1,5 @@

 add_definitions(-DUSE_WINE_TODOS)
-remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS)

 list(APPEND SOURCE
    notification.c