diff --git a/rostests/dibtests/patblt/patblt.rbuild b/rostests/dibtests/patblt/patblt.rbuild
index 628d07f1bda..3017fc94ff6 100644
--- a/rostests/dibtests/patblt/patblt.rbuild
+++ b/rostests/dibtests/patblt/patblt.rbuild
@@ -1,8 +1,6 @@
-
kernel32
user32
gdi32
- -Wno-non-virtual-dtor
patblt.cpp
diff --git a/rostests/dibtests/stretchblt/stretchblt.rbuild b/rostests/dibtests/stretchblt/stretchblt.rbuild
index b2589c0bd48..1fa762e5ab5 100644
--- a/rostests/dibtests/stretchblt/stretchblt.rbuild
+++ b/rostests/dibtests/stretchblt/stretchblt.rbuild
@@ -1,8 +1,6 @@
-
kernel32
user32
gdi32
- -Wno-non-virtual-dtor
stretchblt.cpp
diff --git a/rostests/dxtest/ddraw/ddraw.rbuild b/rostests/dxtest/ddraw/ddraw.rbuild
index dcc87186f24..ba4507efc0b 100644
--- a/rostests/dxtest/ddraw/ddraw.rbuild
+++ b/rostests/dxtest/ddraw/ddraw.rbuild
@@ -1,6 +1,5 @@
-
+
.
-
kernel32
user32
gdi32
diff --git a/rostests/tests/DxHalTest/DxHalTest.rbuild b/rostests/tests/DxHalTest/DxHalTest.rbuild
index 6241a30e627..e3465fd1bdb 100644
--- a/rostests/tests/DxHalTest/DxHalTest.rbuild
+++ b/rostests/tests/DxHalTest/DxHalTest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/Imagelistviewer/imagelistviewer.rbuild b/rostests/tests/Imagelistviewer/imagelistviewer.rbuild
index 7abf5feafd1..8dc10735fa0 100644
--- a/rostests/tests/Imagelistviewer/imagelistviewer.rbuild
+++ b/rostests/tests/Imagelistviewer/imagelistviewer.rbuild
@@ -1,5 +1,4 @@
-
.
kernel32
user32
diff --git a/rostests/tests/edit/edit.rbuild b/rostests/tests/edit/edit.rbuild
index 62b0d26dfb1..fbb833be9c5 100644
--- a/rostests/tests/edit/edit.rbuild
+++ b/rostests/tests/edit/edit.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/enhmetafile/enhmetafile.rbuild b/rostests/tests/enhmetafile/enhmetafile.rbuild
index ef26fa7f107..92f4f4d1a48 100644
--- a/rostests/tests/enhmetafile/enhmetafile.rbuild
+++ b/rostests/tests/enhmetafile/enhmetafile.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/enumfonts/enumfonts.rbuild b/rostests/tests/enumfonts/enumfonts.rbuild
index a49fa60eebd..c6773b4540c 100644
--- a/rostests/tests/enumfonts/enumfonts.rbuild
+++ b/rostests/tests/enumfonts/enumfonts.rbuild
@@ -1,8 +1,6 @@
-
kernel32
user32
gdi32
- -Wno-non-virtual-dtor
enumfonts.cpp
diff --git a/rostests/tests/enumwnd/enumwnd.rbuild b/rostests/tests/enumwnd/enumwnd.rbuild
index 6e2613f3a6f..c44ff096744 100644
--- a/rostests/tests/enumwnd/enumwnd.rbuild
+++ b/rostests/tests/enumwnd/enumwnd.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/enumws/enumws.rbuild b/rostests/tests/enumws/enumws.rbuild
index f36710ad0d3..f58aeffd65b 100644
--- a/rostests/tests/enumws/enumws.rbuild
+++ b/rostests/tests/enumws/enumws.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/event/event.rbuild b/rostests/tests/event/event.rbuild
index f1d9211b71b..53c6eea4d96 100644
--- a/rostests/tests/event/event.rbuild
+++ b/rostests/tests/event/event.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
event.c
diff --git a/rostests/tests/fiber/fiber.rbuild b/rostests/tests/fiber/fiber.rbuild
index e63868204e3..02e52ea088c 100644
--- a/rostests/tests/fiber/fiber.rbuild
+++ b/rostests/tests/fiber/fiber.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
fiber.c
diff --git a/rostests/tests/gethostbyname/gethostbyname.rbuild b/rostests/tests/gethostbyname/gethostbyname.rbuild
index 252d4eb8eaa..e3caab96c5e 100644
--- a/rostests/tests/gethostbyname/gethostbyname.rbuild
+++ b/rostests/tests/gethostbyname/gethostbyname.rbuild
@@ -1,5 +1,4 @@
-
kernel32
ws2_32
gethostbyname.c
diff --git a/rostests/tests/global_mem/global_mem.rbuild b/rostests/tests/global_mem/global_mem.rbuild
index 7dda70dfc7e..6fbddd92e07 100644
--- a/rostests/tests/global_mem/global_mem.rbuild
+++ b/rostests/tests/global_mem/global_mem.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
global_mem.c
diff --git a/rostests/tests/gradient/gradient.rbuild b/rostests/tests/gradient/gradient.rbuild
index e89f12414df..b15629cd935 100644
--- a/rostests/tests/gradient/gradient.rbuild
+++ b/rostests/tests/gradient/gradient.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/guithreadinfo/guithreadinfo.rbuild b/rostests/tests/guithreadinfo/guithreadinfo.rbuild
index ee7ed42f310..72397795b47 100644
--- a/rostests/tests/guithreadinfo/guithreadinfo.rbuild
+++ b/rostests/tests/guithreadinfo/guithreadinfo.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
guithreadinfo.c
diff --git a/rostests/tests/hello/hello.rbuild b/rostests/tests/hello/hello.rbuild
index 918d5901844..8b126e1a394 100644
--- a/rostests/tests/hello/hello.rbuild
+++ b/rostests/tests/hello/hello.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/hivetest/hivetest.rbuild b/rostests/tests/hivetest/hivetest.rbuild
index acc8a74152f..34ad447bfc9 100644
--- a/rostests/tests/hivetest/hivetest.rbuild
+++ b/rostests/tests/hivetest/hivetest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
ntdll
diff --git a/rostests/tests/iptest/iptest.rbuild b/rostests/tests/iptest/iptest.rbuild
index bbf7bd433de..3baa33d2399 100644
--- a/rostests/tests/iptest/iptest.rbuild
+++ b/rostests/tests/iptest/iptest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
iptest.cpp
diff --git a/rostests/tests/isotest/isotest.rbuild b/rostests/tests/isotest/isotest.rbuild
index 5b4cbb82832..a3f5921285e 100644
--- a/rostests/tests/isotest/isotest.rbuild
+++ b/rostests/tests/isotest/isotest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
ntdll
isotest.c
diff --git a/rostests/tests/lantst/lantest.rbuild b/rostests/tests/lantst/lantest.rbuild
index 919afc885d8..a1cfc272032 100644
--- a/rostests/tests/lantst/lantest.rbuild
+++ b/rostests/tests/lantst/lantest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
lantest.cpp
diff --git a/rostests/tests/lineclip/lineclip.rbuild b/rostests/tests/lineclip/lineclip.rbuild
index c1824d10239..c631a8a94a7 100644
--- a/rostests/tests/lineclip/lineclip.rbuild
+++ b/rostests/tests/lineclip/lineclip.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/linetest/linetest.rbuild b/rostests/tests/linetest/linetest.rbuild
index bbe598b1533..9efb94a00e6 100644
--- a/rostests/tests/linetest/linetest.rbuild
+++ b/rostests/tests/linetest/linetest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/lpctst/lpctst.rbuild b/rostests/tests/lpctst/lpctst.rbuild
index c6ccf3c9956..b2936689a76 100644
--- a/rostests/tests/lpctst/lpctst.rbuild
+++ b/rostests/tests/lpctst/lpctst.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
lpctst.c
diff --git a/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild b/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
index 7f0ec15dbfc..9429d5ebf81 100644
--- a/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
+++ b/rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
map_dup_inherit.c
diff --git a/rostests/tests/mdi/mdi.rbuild b/rostests/tests/mdi/mdi.rbuild
index f1ef0757623..98ed290fbae 100644
--- a/rostests/tests/mdi/mdi.rbuild
+++ b/rostests/tests/mdi/mdi.rbuild
@@ -1,6 +1,4 @@
-
- .
kernel32
user32
gdi32
diff --git a/rostests/tests/miditest/miditest.rbuild b/rostests/tests/miditest/miditest.rbuild
index 18bdd93f29b..9103c3b8c8f 100644
--- a/rostests/tests/miditest/miditest.rbuild
+++ b/rostests/tests/miditest/miditest.rbuild
@@ -1,6 +1,4 @@
-
- .
kernel32
user32
winmm
diff --git a/rostests/tests/mktime/mktime.rbuild b/rostests/tests/mktime/mktime.rbuild
index c257236950d..4a5fee25242 100644
--- a/rostests/tests/mktime/mktime.rbuild
+++ b/rostests/tests/mktime/mktime.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
mktime.c
diff --git a/rostests/tests/moztest/moztest.rbuild b/rostests/tests/moztest/moztest.rbuild
index 1c8fee634ba..facd6f53a2f 100644
--- a/rostests/tests/moztest/moztest.rbuild
+++ b/rostests/tests/moztest/moztest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
ntdll
ws2_32
diff --git a/rostests/tests/mstest/mstest.rbuild b/rostests/tests/mstest/mstest.rbuild
index 1c27f59ed8b..62e7b39c78f 100644
--- a/rostests/tests/mstest/mstest.rbuild
+++ b/rostests/tests/mstest/mstest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
mstest.c
diff --git a/rostests/tests/multithrdwin/multithrdwin.rbuild b/rostests/tests/multithrdwin/multithrdwin.rbuild
index 2f6bcfa9173..86a6b7363b9 100644
--- a/rostests/tests/multithrdwin/multithrdwin.rbuild
+++ b/rostests/tests/multithrdwin/multithrdwin.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/multiwin/multiwin.rbuild b/rostests/tests/multiwin/multiwin.rbuild
index 355f8860180..d585e37eb78 100644
--- a/rostests/tests/multiwin/multiwin.rbuild
+++ b/rostests/tests/multiwin/multiwin.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/mutex/mutex.rbuild b/rostests/tests/mutex/mutex.rbuild
index 1000ad3dce8..8c6cb6e8072 100644
--- a/rostests/tests/mutex/mutex.rbuild
+++ b/rostests/tests/mutex/mutex.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
mutex.c
diff --git a/rostests/tests/nameserverlist/nameserverlist.rbuild b/rostests/tests/nameserverlist/nameserverlist.rbuild
index 49323bd46a1..8c2294502e3 100644
--- a/rostests/tests/nameserverlist/nameserverlist.rbuild
+++ b/rostests/tests/nameserverlist/nameserverlist.rbuild
@@ -1,5 +1,4 @@
-
kernel32
iphlpapi
nameserverlist.c
diff --git a/rostests/tests/noexecute/noexecute.rbuild b/rostests/tests/noexecute/noexecute.rbuild
index 1cdee3b21f5..e543938efea 100644
--- a/rostests/tests/noexecute/noexecute.rbuild
+++ b/rostests/tests/noexecute/noexecute.rbuild
@@ -1,5 +1,4 @@
-
pseh
kernel32
user32
diff --git a/rostests/tests/nptest/nptest.rbuild b/rostests/tests/nptest/nptest.rbuild
index 84d3318fd65..88d772da864 100644
--- a/rostests/tests/nptest/nptest.rbuild
+++ b/rostests/tests/nptest/nptest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
nptest.c
diff --git a/rostests/tests/oskittcp/oskittcp.rbuild b/rostests/tests/oskittcp/oskittcp.rbuild
index 8ec4cd64970..21e7ef0116d 100644
--- a/rostests/tests/oskittcp/oskittcp.rbuild
+++ b/rostests/tests/oskittcp/oskittcp.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
tcptest.cpp
diff --git a/rostests/tests/p_dup_handle/p_dup_handle.rbuild b/rostests/tests/p_dup_handle/p_dup_handle.rbuild
index ba5d384e699..5bcead2aa0a 100644
--- a/rostests/tests/p_dup_handle/p_dup_handle.rbuild
+++ b/rostests/tests/p_dup_handle/p_dup_handle.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
p_dup_handle.c
diff --git a/rostests/tests/polytest/polytest.rbuild b/rostests/tests/polytest/polytest.rbuild
index 03fb4728def..e94ad02e659 100644
--- a/rostests/tests/polytest/polytest.rbuild
+++ b/rostests/tests/polytest/polytest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
polytest.cpp
diff --git a/rostests/tests/popupmenu/popupmenu.rbuild b/rostests/tests/popupmenu/popupmenu.rbuild
index 0373de58978..1b8e6aca0b4 100644
--- a/rostests/tests/popupmenu/popupmenu.rbuild
+++ b/rostests/tests/popupmenu/popupmenu.rbuild
@@ -1,5 +1,4 @@
-
.
kernel32
user32
diff --git a/rostests/tests/primitives/primitives.rbuild b/rostests/tests/primitives/primitives.rbuild
index bcb14c0f831..f9310e81098 100644
--- a/rostests/tests/primitives/primitives.rbuild
+++ b/rostests/tests/primitives/primitives.rbuild
@@ -1,9 +1,7 @@
-
kernel32
user32
gdi32
- -Wno-non-virtual-dtor
primitives.cpp
mk_font.cpp
diff --git a/rostests/tests/pteb/pteb.rbuild b/rostests/tests/pteb/pteb.rbuild
index fd303843aea..bf01de681e1 100644
--- a/rostests/tests/pteb/pteb.rbuild
+++ b/rostests/tests/pteb/pteb.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
pteb.c
diff --git a/rostests/tests/readconsole/readconsole.rbuild b/rostests/tests/readconsole/readconsole.rbuild
index 2a1512e5e37..31cdbc2309c 100644
--- a/rostests/tests/readconsole/readconsole.rbuild
+++ b/rostests/tests/readconsole/readconsole.rbuild
@@ -1,7 +1,4 @@
-
-
-
kernel32
main.c
diff --git a/rostests/tests/regdump/regdump.rbuild b/rostests/tests/regdump/regdump.rbuild
index 9778749b99f..e475c049a71 100644
--- a/rostests/tests/regdump/regdump.rbuild
+++ b/rostests/tests/regdump/regdump.rbuild
@@ -1,5 +1,4 @@
-
kernel32
advapi32
gdi32
diff --git a/rostests/tests/regqueryvalue/regqueryvalue.rbuild b/rostests/tests/regqueryvalue/regqueryvalue.rbuild
index 3b493cf13b9..482ada835b4 100644
--- a/rostests/tests/regqueryvalue/regqueryvalue.rbuild
+++ b/rostests/tests/regqueryvalue/regqueryvalue.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
advapi32
diff --git a/rostests/tests/regtest/regtest.rbuild b/rostests/tests/regtest/regtest.rbuild
index 1751d12cf8d..be8c2d61351 100644
--- a/rostests/tests/regtest/regtest.rbuild
+++ b/rostests/tests/regtest/regtest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
regtest.c
diff --git a/rostests/tests/sectest/sectest.rbuild b/rostests/tests/sectest/sectest.rbuild
index 8013b9cebed..f26b607dd5d 100644
--- a/rostests/tests/sectest/sectest.rbuild
+++ b/rostests/tests/sectest/sectest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
sectest.c
diff --git a/rostests/tests/sertest/sertest.rbuild b/rostests/tests/sertest/sertest.rbuild
index 63d92bb5691..eb50480c0b7 100644
--- a/rostests/tests/sertest/sertest.rbuild
+++ b/rostests/tests/sertest/sertest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
sertest.c
diff --git a/rostests/tests/shaptest/shaptest.rbuild b/rostests/tests/shaptest/shaptest.rbuild
index a06bf5c3882..bca071b401f 100644
--- a/rostests/tests/shaptest/shaptest.rbuild
+++ b/rostests/tests/shaptest/shaptest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/shm/shm.rbuild b/rostests/tests/shm/shm.rbuild
index 0f4efd937f6..6e2bcbcfe02 100644
--- a/rostests/tests/shm/shm.rbuild
+++ b/rostests/tests/shm/shm.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
shm.c
diff --git a/rostests/tests/statst/statst.rbuild b/rostests/tests/statst/statst.rbuild
index 07da4d0541d..90f6315b61d 100644
--- a/rostests/tests/statst/statst.rbuild
+++ b/rostests/tests/statst/statst.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/statst2/statst2.rbuild b/rostests/tests/statst2/statst2.rbuild
index 55abda20797..898ec415a30 100644
--- a/rostests/tests/statst2/statst2.rbuild
+++ b/rostests/tests/statst2/statst2.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/subclass/subclass.rbuild b/rostests/tests/subclass/subclass.rbuild
index 84d1b71676b..fc3d9fa90a9 100644
--- a/rostests/tests/subclass/subclass.rbuild
+++ b/rostests/tests/subclass/subclass.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/suspend/suspend.rbuild b/rostests/tests/suspend/suspend.rbuild
index 185f63a8350..0d532e8e368 100644
--- a/rostests/tests/suspend/suspend.rbuild
+++ b/rostests/tests/suspend/suspend.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
suspend.c
diff --git a/rostests/tests/tcpsvr/tcpsvr.rbuild b/rostests/tests/tcpsvr/tcpsvr.rbuild
index 58bf684d29a..fe8ab81f9a2 100644
--- a/rostests/tests/tcpsvr/tcpsvr.rbuild
+++ b/rostests/tests/tcpsvr/tcpsvr.rbuild
@@ -1,5 +1,4 @@
-
kernel32
ws2_32
tcpsvr.c
diff --git a/rostests/tests/terminate/terminate.rbuild b/rostests/tests/terminate/terminate.rbuild
index cde579a053c..750ac884cc3 100644
--- a/rostests/tests/terminate/terminate.rbuild
+++ b/rostests/tests/terminate/terminate.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
terminate.c
diff --git a/rostests/tests/thread/thread.rbuild b/rostests/tests/thread/thread.rbuild
index 8580ac6f3e2..3d3efdda624 100644
--- a/rostests/tests/thread/thread.rbuild
+++ b/rostests/tests/thread/thread.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
thread.c
diff --git a/rostests/tests/thread_msg/thread_msg.rbuild b/rostests/tests/thread_msg/thread_msg.rbuild
index 44ff078ae6f..ed655fbcbce 100644
--- a/rostests/tests/thread_msg/thread_msg.rbuild
+++ b/rostests/tests/thread_msg/thread_msg.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/threadwait/threadwait.rbuild b/rostests/tests/threadwait/threadwait.rbuild
index ed50113bc3c..ee9722722a6 100644
--- a/rostests/tests/threadwait/threadwait.rbuild
+++ b/rostests/tests/threadwait/threadwait.rbuild
@@ -1,5 +1,4 @@
-
kernel32
ntdll
threadwait.c
diff --git a/rostests/tests/tmrqueue/tmrqueue.rbuild b/rostests/tests/tmrqueue/tmrqueue.rbuild
index ea448810aa1..9d7e67a5e9f 100644
--- a/rostests/tests/tmrqueue/tmrqueue.rbuild
+++ b/rostests/tests/tmrqueue/tmrqueue.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
tmrqueue.c
diff --git a/rostests/tests/tokentest/tokentest.rbuild b/rostests/tests/tokentest/tokentest.rbuild
index 8674629f706..ecab4815597 100644
--- a/rostests/tests/tokentest/tokentest.rbuild
+++ b/rostests/tests/tokentest/tokentest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
tokentest.c
diff --git a/rostests/tests/txtscale/txtscale.rbuild b/rostests/tests/txtscale/txtscale.rbuild
index 400b9ebea6a..3be68892d01 100644
--- a/rostests/tests/txtscale/txtscale.rbuild
+++ b/rostests/tests/txtscale/txtscale.rbuild
@@ -1,10 +1,8 @@
-
kernel32
user32
gdi32
comctl32
- -Wno-non-virtual-dtor
txtscale.cpp
mk_font.cpp
diff --git a/rostests/tests/vmtest/vmtest.rbuild b/rostests/tests/vmtest/vmtest.rbuild
index 7993de4ab71..22440409426 100644
--- a/rostests/tests/vmtest/vmtest.rbuild
+++ b/rostests/tests/vmtest/vmtest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
vmtest.c
diff --git a/rostests/tests/wclickat/wclickat.rbuild b/rostests/tests/wclickat/wclickat.rbuild
index 0aeb7fe20cf..0c08d47fa22 100644
--- a/rostests/tests/wclickat/wclickat.rbuild
+++ b/rostests/tests/wclickat/wclickat.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/winhello/winhello.rbuild b/rostests/tests/winhello/winhello.rbuild
index a18c739e0f4..d18991f744e 100644
--- a/rostests/tests/winhello/winhello.rbuild
+++ b/rostests/tests/winhello/winhello.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild b/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
index a509a11d5b1..4a3ab103065 100644
--- a/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
+++ b/rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
@@ -1,8 +1,6 @@
-
kernel32
user32
gdi32
- -Wno-non-virtual-dtor
wm_erasebkgnd.cpp
diff --git a/rostests/tests/wm_paint/wm_paint.rbuild b/rostests/tests/wm_paint/wm_paint.rbuild
index 66e9e590f51..e9cf18170f7 100644
--- a/rostests/tests/wm_paint/wm_paint.rbuild
+++ b/rostests/tests/wm_paint/wm_paint.rbuild
@@ -1,5 +1,4 @@
-
kernel32
user32
gdi32
diff --git a/rostests/tests/wpickclick/wpickclick.rbuild b/rostests/tests/wpickclick/wpickclick.rbuild
index a7e15426d1d..380964d4262 100644
--- a/rostests/tests/wpickclick/wpickclick.rbuild
+++ b/rostests/tests/wpickclick/wpickclick.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
wpickclick.c
diff --git a/rostests/tests/zwcontinue/zwcontinue.rbuild b/rostests/tests/zwcontinue/zwcontinue.rbuild
index fb58880840c..8eda36b9fa4 100644
--- a/rostests/tests/zwcontinue/zwcontinue.rbuild
+++ b/rostests/tests/zwcontinue/zwcontinue.rbuild
@@ -1,5 +1,4 @@
-
kernel32
gdi32
zwcontinue.c
diff --git a/rostests/win32/cmd/cmd_test.rbuild b/rostests/win32/cmd/cmd_test.rbuild
index 57cdf55bdec..954f9292a98 100644
--- a/rostests/win32/cmd/cmd_test.rbuild
+++ b/rostests/win32/cmd/cmd_test.rbuild
@@ -2,9 +2,8 @@
.
include/reactos/wine
.
-
- 0x0501
+ 0x501
rtshared
regtests
cmd_base
diff --git a/rostests/win32/kernel32/queuetest/queuetest.rbuild b/rostests/win32/kernel32/queuetest/queuetest.rbuild
index 4b11aed27ea..483e5d83fc3 100644
--- a/rostests/win32/kernel32/queuetest/queuetest.rbuild
+++ b/rostests/win32/kernel32/queuetest/queuetest.rbuild
@@ -1,5 +1,4 @@
-
kernel32
queuetest.c
diff --git a/rostests/win32/kmtloader/kmtloader.rbuild b/rostests/win32/kmtloader/kmtloader.rbuild
index 56afda216c8..fa40a2d6449 100644
--- a/rostests/win32/kmtloader/kmtloader.rbuild
+++ b/rostests/win32/kmtloader/kmtloader.rbuild
@@ -1,5 +1,4 @@
-
kernel32
advapi32
kmtloader.c
diff --git a/rostests/win32/smss/movefile/movefile.rbuild b/rostests/win32/smss/movefile/movefile.rbuild
index 306005c7a6e..f3c763ea721 100644
--- a/rostests/win32/smss/movefile/movefile.rbuild
+++ b/rostests/win32/smss/movefile/movefile.rbuild
@@ -1,6 +1,5 @@
.
-
kernel32
advapi32
user32
diff --git a/rostests/win32/user32/drawcaption/capicon.c b/rostests/win32/user32/drawcaption/capicon.c
index cef5ca22f3c..c113b4dbdf8 100644
--- a/rostests/win32/user32/drawcaption/capicon.c
+++ b/rostests/win32/user32/drawcaption/capicon.c
@@ -63,7 +63,7 @@ LRESULT CALLBACK WndProc(HWND hWnd,
}
-INT main(INT argc, CHAR **argv)
+int wmain(int argc, wchar_t**argv)
{
HWND hWnd;
MSG msg;
@@ -83,7 +83,7 @@ INT main(INT argc, CHAR **argv)
return 0;
}
- testnum = atoi(argv[1]);
+ testnum = _wtoi(argv[1]);
if(testnum < 1 || testnum > 5)
{
printf("Unknown test %d\n", testnum);
diff --git a/rostests/win32/user32/drawcaption/drawcap.c b/rostests/win32/user32/drawcaption/drawcap.c
index 601d49f1520..2e31ee4e748 100644
--- a/rostests/win32/user32/drawcaption/drawcap.c
+++ b/rostests/win32/user32/drawcaption/drawcap.c
@@ -180,7 +180,7 @@ LRESULT CALLBACK CaptWndProc(HWND hWnd,
}
-INT main(INT argc, CHAR **argv)
+int wmain(int argc, wchar_t**argv)
{
HWND hWnd;
MSG msg;
@@ -205,7 +205,7 @@ INT main(INT argc, CHAR **argv)
return 0;
}
- testnum = atoi(argv[1]);
+ testnum = _wtoi(argv[1]);
if(testnum < 1 || testnum > 8)
{
printf("Unknown test %d\n", testnum);
diff --git a/rostests/win32/user32/drawcaption/drawcaption.rbuild b/rostests/win32/user32/drawcaption/drawcaption.rbuild
index 6a7a720fb2e..7316fcecff2 100644
--- a/rostests/win32/user32/drawcaption/drawcaption.rbuild
+++ b/rostests/win32/user32/drawcaption/drawcaption.rbuild
@@ -1,11 +1,8 @@
-
+
.
-
-
-
kernel32
user32
gdi32
@@ -13,11 +10,8 @@
drawcap.rc
-
+
.
-
-
-
kernel32
user32
gdi32
diff --git a/rostests/win32/user32/kbdlayout/kbdlayout.rbuild b/rostests/win32/user32/kbdlayout/kbdlayout.rbuild
index fe7706ef401..d2d1b58a459 100644
--- a/rostests/win32/user32/kbdlayout/kbdlayout.rbuild
+++ b/rostests/win32/user32/kbdlayout/kbdlayout.rbuild
@@ -1,7 +1,5 @@
.
-
-
kernel32
user32
gdi32
diff --git a/rostests/win32/user32/sysicon/sysicon.c b/rostests/win32/user32/sysicon/sysicon.c
index 84802a1dfb8..0e74fbbcbd5 100644
--- a/rostests/win32/user32/sysicon/sysicon.c
+++ b/rostests/win32/user32/sysicon/sysicon.c
@@ -66,9 +66,9 @@ LRESULT CALLBACK WndProc(HWND hWnd,
return DefWindowProc(hWnd, msg, wParam, lParam);
}
-int APIENTRY WinMain(HINSTANCE hInst,
+int APIENTRY wWinMain(HINSTANCE hInst,
HINSTANCE hPrevInstance,
- LPSTR lpCmdLine,
+ LPWSTR lpCmdLine,
int nCmdShow)
{
HWND hWnd1, hWnd2, hWnd3;
diff --git a/rostests/win32/user32/sysicon/sysicon.rbuild b/rostests/win32/user32/sysicon/sysicon.rbuild
index d3d088a8ef2..f71133422b8 100644
--- a/rostests/win32/user32/sysicon/sysicon.rbuild
+++ b/rostests/win32/user32/sysicon/sysicon.rbuild
@@ -1,8 +1,5 @@
-
+
.
-
-
-
kernel32
user32
gdi32
diff --git a/rostests/win32/win32k/win32k.rbuild b/rostests/win32/win32k/win32k.rbuild
index 41660f11879..24a410216a7 100644
--- a/rostests/win32/win32k/win32k.rbuild
+++ b/rostests/win32/win32k/win32k.rbuild
@@ -4,11 +4,6 @@
include
include
include
-
-
- 0x0501
- 0x600
-
rtshared
regtests
diff --git a/rostests/winetests/GUI/GUI.rbuild b/rostests/winetests/GUI/GUI.rbuild
index f73c7cbc46a..2e3722df945 100644
--- a/rostests/winetests/GUI/GUI.rbuild
+++ b/rostests/winetests/GUI/GUI.rbuild
@@ -3,7 +3,7 @@
.
0x600
- 0x501
+ 0x501
gdi32
kernel32
diff --git a/rostests/winetests/advapi32/advapi32.rbuild b/rostests/winetests/advapi32/advapi32.rbuild
index 651e745cd35..d78d2bcd005 100644
--- a/rostests/winetests/advapi32/advapi32.rbuild
+++ b/rostests/winetests/advapi32/advapi32.rbuild
@@ -2,9 +2,7 @@
- -Wno-format
.
-
advapi32
kernel32
diff --git a/rostests/winetests/advpack/advpack.rbuild b/rostests/winetests/advpack/advpack.rbuild
index 5518c3898d8..c6b9566aa0b 100644
--- a/rostests/winetests/advpack/advpack.rbuild
+++ b/rostests/winetests/advpack/advpack.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
advpack.c
diff --git a/rostests/winetests/browseui/browseui.rbuild b/rostests/winetests/browseui/browseui.rbuild
index 6cb96deae17..d6b5e3768b7 100644
--- a/rostests/winetests/browseui/browseui.rbuild
+++ b/rostests/winetests/browseui/browseui.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
wine
diff --git a/rostests/winetests/cabinet/cabinet.rbuild b/rostests/winetests/cabinet/cabinet.rbuild
index 50b2e276c9d..5ce09e639d9 100644
--- a/rostests/winetests/cabinet/cabinet.rbuild
+++ b/rostests/winetests/cabinet/cabinet.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
extract.c
diff --git a/rostests/winetests/comcat/comcat.rbuild b/rostests/winetests/comcat/comcat.rbuild
index 56fad49b60c..ecf216d68b8 100644
--- a/rostests/winetests/comcat/comcat.rbuild
+++ b/rostests/winetests/comcat/comcat.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
comcat.c
diff --git a/rostests/winetests/comdlg32/comdlg32.rbuild b/rostests/winetests/comdlg32/comdlg32.rbuild
index 1462064b750..c2e5d0daf66 100644
--- a/rostests/winetests/comdlg32/comdlg32.rbuild
+++ b/rostests/winetests/comdlg32/comdlg32.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
filedlg.c
diff --git a/rostests/winetests/crypt32/crypt32.rbuild b/rostests/winetests/crypt32/crypt32.rbuild
index c92aa41e46a..3870f336383 100644
--- a/rostests/winetests/crypt32/crypt32.rbuild
+++ b/rostests/winetests/crypt32/crypt32.rbuild
@@ -2,8 +2,8 @@
- -Wno-format
.
+
base64.c
cert.c
chain.c
diff --git a/rostests/winetests/gdi32/gdi32.rbuild b/rostests/winetests/gdi32/gdi32.rbuild
index cc55487c431..c865e35d06f 100644
--- a/rostests/winetests/gdi32/gdi32.rbuild
+++ b/rostests/winetests/gdi32/gdi32.rbuild
@@ -2,10 +2,9 @@
- -Wno-format
+ -Wno-format
.
-
ntdll
gdi32
kernel32
diff --git a/rostests/winetests/gdiplus/gdiplus.rbuild b/rostests/winetests/gdiplus/gdiplus.rbuild
index 02cbcfd9413..531e90b48a6 100644
--- a/rostests/winetests/gdiplus/gdiplus.rbuild
+++ b/rostests/winetests/gdiplus/gdiplus.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
brush.c
diff --git a/rostests/winetests/hlink/hlink.rbuild b/rostests/winetests/hlink/hlink.rbuild
index f4bf710e094..7f77113d0a6 100644
--- a/rostests/winetests/hlink/hlink.rbuild
+++ b/rostests/winetests/hlink/hlink.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
hlink.c
diff --git a/rostests/winetests/icmp/icmp.rbuild b/rostests/winetests/icmp/icmp.rbuild
index 7363a2fb488..827d44ded66 100644
--- a/rostests/winetests/icmp/icmp.rbuild
+++ b/rostests/winetests/icmp/icmp.rbuild
@@ -2,9 +2,7 @@
- -Wno-format
.
-
kernel32
ntdll
diff --git a/rostests/winetests/imm32/imm32.rbuild b/rostests/winetests/imm32/imm32.rbuild
index 6b1434b0c37..efd37b6d02d 100644
--- a/rostests/winetests/imm32/imm32.rbuild
+++ b/rostests/winetests/imm32/imm32.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
imm32.c
diff --git a/rostests/winetests/iphlpapi/iphlpapi.rbuild b/rostests/winetests/iphlpapi/iphlpapi.rbuild
index 3e0ce485864..644c9c0efc0 100644
--- a/rostests/winetests/iphlpapi/iphlpapi.rbuild
+++ b/rostests/winetests/iphlpapi/iphlpapi.rbuild
@@ -2,8 +2,8 @@
- -Wno-format
.
+
iphlpapi.c
testlist.c
wine
diff --git a/rostests/winetests/jscript/jscript.rbuild b/rostests/winetests/jscript/jscript.rbuild
index 2e1a1a59319..b37bb04bcd0 100644
--- a/rostests/winetests/jscript/jscript.rbuild
+++ b/rostests/winetests/jscript/jscript.rbuild
@@ -2,8 +2,8 @@
- -Wno-format
.
+
jscript.c
run.c
testlist.c
diff --git a/rostests/winetests/kernel32/kernel32.rbuild b/rostests/winetests/kernel32/kernel32.rbuild
index ccadc03667d..8ea74c843da 100644
--- a/rostests/winetests/kernel32/kernel32.rbuild
+++ b/rostests/winetests/kernel32/kernel32.rbuild
@@ -4,7 +4,6 @@
-Wno-format
.
-
ntdll
kernel32
@@ -43,6 +42,5 @@
virtual.c
volume.c
testlist.c
- resource.rc
diff --git a/rostests/winetests/lz32/lz32.rbuild b/rostests/winetests/lz32/lz32.rbuild
index d46524bcdda..f189ae9366d 100644
--- a/rostests/winetests/lz32/lz32.rbuild
+++ b/rostests/winetests/lz32/lz32.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
lzexpand_main.c
diff --git a/rostests/winetests/mapi32/mapi32.rbuild b/rostests/winetests/mapi32/mapi32.rbuild
index 1debf2ee6a0..bf91266d0a7 100644
--- a/rostests/winetests/mapi32/mapi32.rbuild
+++ b/rostests/winetests/mapi32/mapi32.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
imalloc.c
diff --git a/rostests/winetests/mlang/mlang.rbuild b/rostests/winetests/mlang/mlang.rbuild
index 0cd4a4eef58..37b3b2ab3de 100644
--- a/rostests/winetests/mlang/mlang.rbuild
+++ b/rostests/winetests/mlang/mlang.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
mlang.c
diff --git a/rostests/winetests/msacm32/msacm32.rbuild b/rostests/winetests/msacm32/msacm32.rbuild
index c2fe5162306..8dc00928dc7 100644
--- a/rostests/winetests/msacm32/msacm32.rbuild
+++ b/rostests/winetests/msacm32/msacm32.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
wine
diff --git a/rostests/winetests/mshtml/mshtml.rbuild b/rostests/winetests/mshtml/mshtml.rbuild
index 118c843b96c..99f208b4c8c 100644
--- a/rostests/winetests/mshtml/mshtml.rbuild
+++ b/rostests/winetests/mshtml/mshtml.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
dom.c
diff --git a/rostests/winetests/msi/msi.rbuild b/rostests/winetests/msi/msi.rbuild
index 45524def2d2..72de4ebbb37 100644
--- a/rostests/winetests/msi/msi.rbuild
+++ b/rostests/winetests/msi/msi.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
automation.c
diff --git a/rostests/winetests/mstask/mstask.rbuild b/rostests/winetests/mstask/mstask.rbuild
index 8a4a1e798f2..3b1976937f7 100644
--- a/rostests/winetests/mstask/mstask.rbuild
+++ b/rostests/winetests/mstask/mstask.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
task.c
diff --git a/rostests/winetests/msvcrt/msvcrt.rbuild b/rostests/winetests/msvcrt/msvcrt.rbuild
index 8f8512a9390..0601d9809b9 100644
--- a/rostests/winetests/msvcrt/msvcrt.rbuild
+++ b/rostests/winetests/msvcrt/msvcrt.rbuild
@@ -5,7 +5,6 @@
-Wno-format
.
include/reactos/wine/msvcrt
-
kernel32
diff --git a/rostests/winetests/netapi32/netapi32.rbuild b/rostests/winetests/netapi32/netapi32.rbuild
index a0c35b05cdd..7bf6e3a764d 100644
--- a/rostests/winetests/netapi32/netapi32.rbuild
+++ b/rostests/winetests/netapi32/netapi32.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
access.c
diff --git a/rostests/winetests/ntdll/ntdll.rbuild b/rostests/winetests/ntdll/ntdll.rbuild
index 9be19d047c8..dd9dc574e61 100644
--- a/rostests/winetests/ntdll/ntdll.rbuild
+++ b/rostests/winetests/ntdll/ntdll.rbuild
@@ -2,9 +2,7 @@
- -Wno-format
.
-
kernel32
ntdll
diff --git a/rostests/winetests/odbccp32/odbccp32.rbuild b/rostests/winetests/odbccp32/odbccp32.rbuild
index 7851118ef32..6e57a47079d 100644
--- a/rostests/winetests/odbccp32/odbccp32.rbuild
+++ b/rostests/winetests/odbccp32/odbccp32.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
misc.c
diff --git a/rostests/winetests/ole32/ole32.rbuild b/rostests/winetests/ole32/ole32.rbuild
index 8817952ba8a..edd6406b76a 100644
--- a/rostests/winetests/ole32/ole32.rbuild
+++ b/rostests/winetests/ole32/ole32.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
clipboard.c
diff --git a/rostests/winetests/powrprof/powrprof.rbuild b/rostests/winetests/powrprof/powrprof.rbuild
index 6d21cec1197..9100ba8406c 100644
--- a/rostests/winetests/powrprof/powrprof.rbuild
+++ b/rostests/winetests/powrprof/powrprof.rbuild
@@ -1,10 +1,8 @@
- -Wno-format
.
-
-
-
+
+
powrprof
ntdll
advapi32
diff --git a/rostests/winetests/psapi/psapi.rbuild b/rostests/winetests/psapi/psapi.rbuild
index 3e7df36f9ba..a9034f75549 100644
--- a/rostests/winetests/psapi/psapi.rbuild
+++ b/rostests/winetests/psapi/psapi.rbuild
@@ -2,10 +2,8 @@
- -Wno-format
.
-
kernel32
ntdll
psapi
diff --git a/rostests/winetests/rpcrt4/rpcrt4.rbuild b/rostests/winetests/rpcrt4/rpcrt4.rbuild
index efb526898fc..a793ccd0f26 100644
--- a/rostests/winetests/rpcrt4/rpcrt4.rbuild
+++ b/rostests/winetests/rpcrt4/rpcrt4.rbuild
@@ -11,7 +11,6 @@
-Wno-format
.
.
-
wine
pseh
@@ -30,4 +29,4 @@
server.c
testlist.c
-
\ No newline at end of file
+
diff --git a/rostests/winetests/rsabase/rsabase.rbuild b/rostests/winetests/rsabase/rsabase.rbuild
index 2decf107c64..c4af042b20b 100644
--- a/rostests/winetests/rsabase/rsabase.rbuild
+++ b/rostests/winetests/rsabase/rsabase.rbuild
@@ -1,7 +1,6 @@
- -Wno-format
.
wine
diff --git a/rostests/winetests/rsaenh/rsaenh.rbuild b/rostests/winetests/rsaenh/rsaenh.rbuild
index 2142dedefa7..469db2970ce 100644
--- a/rostests/winetests/rsaenh/rsaenh.rbuild
+++ b/rostests/winetests/rsaenh/rsaenh.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
rsaenh.c
diff --git a/rostests/winetests/schannel/schannel.rbuild b/rostests/winetests/schannel/schannel.rbuild
index 82cce22c9ca..4eea0f86408 100644
--- a/rostests/winetests/schannel/schannel.rbuild
+++ b/rostests/winetests/schannel/schannel.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
wine
diff --git a/rostests/winetests/setupapi/setupapi.rbuild b/rostests/winetests/setupapi/setupapi.rbuild
index 4da0549e039..290739270d6 100644
--- a/rostests/winetests/setupapi/setupapi.rbuild
+++ b/rostests/winetests/setupapi/setupapi.rbuild
@@ -2,9 +2,8 @@
- -Wno-format
+ -Wno-format
.
-
ntdll
kernel32
diff --git a/rostests/winetests/shell32/shell32.rbuild b/rostests/winetests/shell32/shell32.rbuild
index c1dd598bc46..6d29d7917d7 100644
--- a/rostests/winetests/shell32/shell32.rbuild
+++ b/rostests/winetests/shell32/shell32.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
wine
diff --git a/rostests/winetests/shlwapi/shlwapi.rbuild b/rostests/winetests/shlwapi/shlwapi.rbuild
index b93c8907889..f17bcd6e8ea 100644
--- a/rostests/winetests/shlwapi/shlwapi.rbuild
+++ b/rostests/winetests/shlwapi/shlwapi.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
assoc.c
diff --git a/rostests/winetests/urlmon/urlmon.rbuild b/rostests/winetests/urlmon/urlmon.rbuild
index 54635ebbaca..96ecca71529 100644
--- a/rostests/winetests/urlmon/urlmon.rbuild
+++ b/rostests/winetests/urlmon/urlmon.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
generated.c
diff --git a/rostests/winetests/user32/user32.rbuild b/rostests/winetests/user32/user32.rbuild
index c2d46991abf..cd56c6201f0 100644
--- a/rostests/winetests/user32/user32.rbuild
+++ b/rostests/winetests/user32/user32.rbuild
@@ -2,10 +2,9 @@
- -Wno-format
+ -Wno-format
.
include/reactos/wine
-
ntdll
user32
diff --git a/rostests/winetests/usp10/usp10.rbuild b/rostests/winetests/usp10/usp10.rbuild
index 8708c2c1ecd..d376e4845c8 100644
--- a/rostests/winetests/usp10/usp10.rbuild
+++ b/rostests/winetests/usp10/usp10.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
usp10.c
diff --git a/rostests/winetests/uxtheme/uxtheme.rbuild b/rostests/winetests/uxtheme/uxtheme.rbuild
index 805c38e4a44..917aad8b8c0 100644
--- a/rostests/winetests/uxtheme/uxtheme.rbuild
+++ b/rostests/winetests/uxtheme/uxtheme.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
system.c
diff --git a/rostests/winetests/version/version.rbuild b/rostests/winetests/version/version.rbuild
index b6bd1191269..7f88072fd2f 100644
--- a/rostests/winetests/version/version.rbuild
+++ b/rostests/winetests/version/version.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
info.c
diff --git a/rostests/winetests/winhttp/winhttp.rbuild b/rostests/winetests/winhttp/winhttp.rbuild
index a08973191e2..b12b9d31e02 100644
--- a/rostests/winetests/winhttp/winhttp.rbuild
+++ b/rostests/winetests/winhttp/winhttp.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
notification.c
diff --git a/rostests/winetests/wininet/wininet.rbuild b/rostests/winetests/wininet/wininet.rbuild
index 2ff720f4dfa..32abbc60f1f 100644
--- a/rostests/winetests/wininet/wininet.rbuild
+++ b/rostests/winetests/wininet/wininet.rbuild
@@ -2,7 +2,6 @@
- -Wno-format
.
wine