Some obsolete flags removed, some useless compiler flags removed & shit. Nothing earth-shattering

<insert ginormous commit message ruined by TortoiseSVN's shitty GUI>

svn path=/trunk/; revision=40537

rostests/dibtests/patblt/patblt.rbuild

@@ -1,8 +1,6 @@
 <module name="patblt" type="win32gui" installbase="bin" installname="patblt.exe" allowwarnings="true" stdlib="host">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>patblt.cpp</file>
 </module>

rostests/dibtests/stretchblt/stretchblt.rbuild

@@ -1,8 +1,6 @@
 <module name="stretchblt" type="win32gui" installbase="bin" installname="stretchblt.exe" stdlib="host">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>stretchblt.cpp</file>
 </module>

rostests/dxtest/ddraw/ddraw.rbuild

@@ -1,6 +1,5 @@
-<module name="ddraw_test" type="win32cui" allowwarnings="true">
+<module name="ddraw_test" type="win32cui" allowwarnings="false">
 	<include base="ddraw_test">.</include>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/DxHalTest/DxHalTest.rbuild

@@ -1,5 +1,4 @@
 <module name="dxhaltest" type="win32cui" installbase="bin" installname="dxhaltest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/Imagelistviewer/imagelistviewer.rbuild

@@ -1,5 +1,4 @@
 <module name="Imagelistviewer" type="win32gui" installbase="bin" installname="Imagelistviewer.exe">
-	<define name="__USE_W32API" />
 	<include base="Imagelistviewer">.</include>
 	<library>kernel32</library>
 	<library>user32</library>

rostests/tests/edit/edit.rbuild

@@ -1,5 +1,4 @@
 <module name="edit" type="win32gui" installbase="bin" installname="edit.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/enhmetafile/enhmetafile.rbuild

@@ -1,5 +1,4 @@
 <module name="enhmetafile" type="win32gui" installbase="bin" installname="enhmetafile.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/enumfonts/enumfonts.rbuild

@@ -1,8 +1,6 @@
 <module name="enumfonts" type="win32gui" installbase="bin" installname="enumfonts.exe" stdlib="host">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>enumfonts.cpp</file>
 </module>

rostests/tests/enumwnd/enumwnd.rbuild

@@ -1,5 +1,4 @@
 <module name="enumwnd" type="win32gui" installbase="bin" installname="enumwnd.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/enumws/enumws.rbuild

@@ -1,5 +1,4 @@
 <module name="enumws" type="win32gui" installbase="bin" installname="enumws.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/event/event.rbuild

@@ -1,5 +1,4 @@
 <module name="event" type="win32gui" installbase="bin" installname="event.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>event.c</file>

rostests/tests/fiber/fiber.rbuild

@@ -1,5 +1,4 @@
 <module name="fiber" type="win32cui" installbase="bin" installname="fiber.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>fiber.c</file>

rostests/tests/gethostbyname/gethostbyname.rbuild

@@ -1,5 +1,4 @@
 <module name="gethostbyname" type="win32gui" installbase="bin" installname="gethostbyname.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>gethostbyname.c</file>

rostests/tests/global_mem/global_mem.rbuild

@@ -1,5 +1,4 @@
 <module name="global_mem" type="win32gui" installbase="bin" installname="global_mem.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>global_mem.c</file>

rostests/tests/gradient/gradient.rbuild

@@ -1,5 +1,4 @@
 <module name="gradient" type="win32gui" installbase="bin" installname="gradient.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/guithreadinfo/guithreadinfo.rbuild

@@ -1,5 +1,4 @@
 <module name="guithreadinfo" type="win32gui" installbase="bin" installname="guithreadinfo.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>guithreadinfo.c</file>

rostests/tests/hello/hello.rbuild

@@ -1,5 +1,4 @@
 <module name="hello" type="win32cui" installbase="bin" installname="hello.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/hivetest/hivetest.rbuild

@@ -1,5 +1,4 @@
 <module name="hivetest" type="win32gui" installbase="bin" installname="hivetest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>ntdll</library>

rostests/tests/iptest/iptest.rbuild

@@ -1,5 +1,4 @@
 <module name="iptest" type="win32gui" installbase="bin" installname="iptest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>iptest.cpp</file>

rostests/tests/isotest/isotest.rbuild

@@ -1,5 +1,4 @@
 <module name="isotest" type="win32cui" installbase="bin" installname="isotest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>isotest.c</file>

rostests/tests/lantst/lantest.rbuild

@@ -1,5 +1,4 @@
 <module name="lantest" type="win32gui" installbase="bin" installname="lantest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>lantest.cpp</file>

rostests/tests/lineclip/lineclip.rbuild

@@ -1,5 +1,4 @@
 <module name="lineclip" type="win32gui" installbase="bin" installname="lineclip.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/linetest/linetest.rbuild

@@ -1,5 +1,4 @@
 <module name="linetest" type="win32gui" installbase="bin" installname="linetest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/lpctst/lpctst.rbuild

@@ -1,5 +1,4 @@
 <module name="lpctst" type="win32gui" installbase="bin" installname="lpctst.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>lpctst.c</file>

rostests/tests/map_dup_inherit/map_dup_inherit.rbuild

@@ -1,5 +1,4 @@
 <module name="map_dup_inherit" type="win32cui" installbase="bin" installname="map_dup_inherit.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>map_dup_inherit.c</file>

rostests/tests/mdi/mdi.rbuild

@@ -1,6 +1,4 @@
 <module name="mdi" type="win32gui" installbase="bin" installname="mdi.exe">
-	<define name="__USE_W32API" />
-	<include base="mdi">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/miditest/miditest.rbuild

@@ -1,6 +1,4 @@
 <module name="miditest" type="win32gui" installbase="bin" installname="miditest.exe">
-	<define name="__USE_W32API" />
-	<include base="miditest">.</include>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>winmm</library>

rostests/tests/mktime/mktime.rbuild

@@ -1,5 +1,4 @@
 <module name="mktime" type="win32gui" installbase="bin" installname="mktime.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>mktime.c</file>

rostests/tests/moztest/moztest.rbuild

@@ -1,5 +1,4 @@
 <module name="moztest" type="win32cui" installbase="bin" installname="moztest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>ws2_32</library>

rostests/tests/mstest/mstest.rbuild

@@ -1,5 +1,4 @@
 <module name="mstest" type="win32gui" installbase="bin" installname="mstest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>mstest.c</file>

rostests/tests/multithrdwin/multithrdwin.rbuild

@@ -1,5 +1,4 @@
 <module name="multithrdwin" type="win32gui" installbase="bin" installname="multithrdwin.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/multiwin/multiwin.rbuild

@@ -1,5 +1,4 @@
 <module name="multiwin" type="win32gui" installbase="bin" installname="multiwin.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/mutex/mutex.rbuild

@@ -1,5 +1,4 @@
 <module name="mutex" type="win32gui" installbase="bin" installname="mutex.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>mutex.c</file>

rostests/tests/nameserverlist/nameserverlist.rbuild

@@ -1,5 +1,4 @@
 <module name="nameserverlist" type="win32cui" installbase="bin" installname="nameserverlist.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>iphlpapi</library>
 	<file>nameserverlist.c</file>

rostests/tests/noexecute/noexecute.rbuild

@@ -1,5 +1,4 @@
 <module name="noexecute" type="win32cui" installbase="bin" installname="noexecute.exe">
-	<define name="__USE_W32API" />
 	<library>pseh</library>
 	<library>kernel32</library>
 	<library>user32</library>

rostests/tests/nptest/nptest.rbuild

@@ -1,5 +1,4 @@
 <module name="nptest" type="win32gui" installbase="bin" installname="nptest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>nptest.c</file>

rostests/tests/oskittcp/oskittcp.rbuild

@@ -1,5 +1,4 @@
 <module name="oskittcptst" type="win32gui" installbase="bin" installname="tcptest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>tcptest.cpp</file>

rostests/tests/p_dup_handle/p_dup_handle.rbuild

@@ -1,5 +1,4 @@
 <module name="p_dup_handle" type="win32cui" installbase="bin" installname="p_dup_handle.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>p_dup_handle.c</file>

rostests/tests/polytest/polytest.rbuild

@@ -1,5 +1,4 @@
 <module name="polytest" type="win32gui" installbase="bin" installname="polytest.exe" allowwarnings="true">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>polytest.cpp</file>

rostests/tests/popupmenu/popupmenu.rbuild

@@ -1,5 +1,4 @@
 <module name="popupmenu" type="win32gui" installbase="bin" installname="popupmenu.exe">
-	<define name="__USE_W32API" />
 	<include base="popupmenu">.</include>
 	<library>kernel32</library>
 	<library>user32</library>

rostests/tests/primitives/primitives.rbuild

@@ -1,9 +1,7 @@
 <module name="primitives" type="win32gui" installbase="bin" installname="primitives.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>primitives.cpp</file>
 	<file>mk_font.cpp</file>
 </module>

rostests/tests/pteb/pteb.rbuild

@@ -1,5 +1,4 @@
 <module name="pteb" type="win32gui" installbase="bin" installname="pteb.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>pteb.c</file>

rostests/tests/readconsole/readconsole.rbuild

@@ -1,7 +1,4 @@
 <module name="readconsole" type="win32cui" installbase="bin" installname="readconsole.exe">
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<file>main.c</file>
 </module>

rostests/tests/regdump/regdump.rbuild

@@ -1,5 +1,4 @@
 <module name="regdump" type="win32cui" installbase="bin" installname="regdump.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>gdi32</library>

rostests/tests/regqueryvalue/regqueryvalue.rbuild

@@ -1,5 +1,4 @@
 <module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>

rostests/tests/regtest/regtest.rbuild

@@ -1,5 +1,4 @@
 <module name="regtest" type="win32gui" installbase="bin" installname="regtest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>regtest.c</file>

rostests/tests/sectest/sectest.rbuild

@@ -1,5 +1,4 @@
 <module name="sectest" type="win32gui" installbase="bin" installname="sectest.exe" allowwarnings="true">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>sectest.c</file>

rostests/tests/sertest/sertest.rbuild

@@ -1,5 +1,4 @@
 <module name="sertest" type="win32gui" installbase="bin" installname="sertest.exe" allowwarnings="true">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>sertest.c</file>

rostests/tests/shaptest/shaptest.rbuild

@@ -1,5 +1,4 @@
 <module name="shaptest" type="win32gui" installbase="bin" installname="shaptest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/shm/shm.rbuild

@@ -1,5 +1,4 @@
 <module name="shm" type="win32gui" installbase="bin" installname="shm.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>shm.c</file>

rostests/tests/statst/statst.rbuild

@@ -1,5 +1,4 @@
 <module name="statst" type="win32gui" installbase="bin" installname="statst.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/statst2/statst2.rbuild

@@ -1,5 +1,4 @@
 <module name="statst2" type="win32gui" installbase="bin" installname="statst2.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/subclass/subclass.rbuild

@@ -1,5 +1,4 @@
 <module name="subclass" type="win32gui" installbase="bin" installname="subclass.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/suspend/suspend.rbuild

@@ -1,5 +1,4 @@
 <module name="suspend" type="win32gui" installbase="bin" installname="suspend.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>suspend.c</file>

rostests/tests/tcpsvr/tcpsvr.rbuild

@@ -1,5 +1,4 @@
 <module name="tcpsvr" type="win32cui" installbase="bin" installname="tcpsvr.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<file>tcpsvr.c</file>

rostests/tests/terminate/terminate.rbuild

@@ -1,5 +1,4 @@
 <module name="terminate" type="win32cui" installbase="bin" installname="terminate.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>terminate.c</file>

rostests/tests/thread/thread.rbuild

@@ -1,5 +1,4 @@
 <module name="thread" type="win32gui" installbase="bin" installname="thread.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>thread.c</file>

rostests/tests/thread_msg/thread_msg.rbuild

@@ -1,5 +1,4 @@
 <module name="thread_msg" type="win32gui" installbase="bin" installname="thread_msg.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/threadwait/threadwait.rbuild

@@ -1,5 +1,4 @@
 <module name="threadwait" type="win32gui" installbase="bin" installname="threadwait.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>threadwait.c</file>

rostests/tests/tmrqueue/tmrqueue.rbuild

@@ -1,5 +1,4 @@
 <module name="tmrqueue" type="win32gui" installbase="bin" installname="tmrqueue.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>tmrqueue.c</file>

rostests/tests/tokentest/tokentest.rbuild

@@ -1,5 +1,4 @@
 <module name="tokentest" type="win32gui" installbase="bin" installname="tokentest.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>tokentest.c</file>

rostests/tests/txtscale/txtscale.rbuild

@@ -1,10 +1,8 @@
 <module name="txtscale" type="win32gui" installbase="bin" installname="txtscale.exe" allowwarnings ="true" stdlib="host">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
-	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>txtscale.cpp</file>
 	<file>mk_font.cpp</file>
 </module>

rostests/tests/vmtest/vmtest.rbuild

@@ -1,5 +1,4 @@
 <module name="vmtest" type="win32cui" installbase="bin" installname="vmtest.exe" allowwarnings="true">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>vmtest.c</file>

rostests/tests/wclickat/wclickat.rbuild

@@ -1,5 +1,4 @@
 <module name="wclickat" type="win32gui" installbase="bin" installname="wclickat.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/winhello/winhello.rbuild

@@ -1,5 +1,4 @@
 <module name="winhello" type="win32gui" installbase="bin" installname="winhello.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild

@@ -1,8 +1,6 @@
 <module name="wm_erasebkgnd" type="win32gui" installbase="bin" installname="wm_erasebkgnd.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
 	<file>wm_erasebkgnd.cpp</file>
 </module>

rostests/tests/wm_paint/wm_paint.rbuild

@@ -1,5 +1,4 @@
 <module name="wm_paint" type="win32gui" installbase="bin" installname="wm_paint.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/tests/wpickclick/wpickclick.rbuild

@@ -1,5 +1,4 @@
 <module name="wpickclick" type="win32gui" installbase="bin" installname="wpickclick.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>wpickclick.c</file>

rostests/tests/zwcontinue/zwcontinue.rbuild

@@ -1,5 +1,4 @@
 <module name="zwcontinue" type="win32gui" installbase="bin" installname="zwcontinue.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<file>zwcontinue.c</file>

rostests/win32/cmd/cmd_test.rbuild

@@ -2,9 +2,8 @@
 	<include base="rtshared">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<include base="cmd">.</include>
-	<define name="__USE_W32API" />
 	<define name="ANONYMOUSUNIONS" />
-	<define name="_WIN32_WINNT">0x0501</define>
+	<redefine name="_WIN32_WINNT">0x501</redefine>
 	<library>rtshared</library>
 	<library>regtests</library>
 	<library>cmd_base</library>

rostests/win32/kernel32/queuetest/queuetest.rbuild

@@ -1,5 +1,4 @@
 <module name="queuetest" type="win32cui" installbase="system32" installname="queuetest.exe">
-        <define name="__USE_W32API" />
 	<library>kernel32</library>
 	<file>queuetest.c</file>
 </module>

rostests/win32/kmtloader/kmtloader.rbuild

@@ -1,5 +1,4 @@
 <module name="kmtloader" type="win32cui" installbase="system32" installname="kmtloader.exe">
-        <define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>kmtloader.c</file>

rostests/win32/smss/movefile/movefile.rbuild

@@ -1,6 +1,5 @@
 <module name="movefile" type="win32cui" installbase="system32" installname="movefiletest.exe">
 	<include base="movefile">.</include>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>

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);

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);

rostests/win32/user32/drawcaption/drawcaption.rbuild

@@ -1,11 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <group>
-<module name="drawcap" type="win32cui" installbase="system32" installname="drawcap.exe">
+<module name="drawcap" type="win32cui" installbase="system32" installname="drawcap.exe" unicode="true">
 	<include base="drawcap">.</include>
-	<define name="__USE_W32API" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
@@ -13,11 +10,8 @@
 	<file>drawcap.rc</file>
 </module>
 
-<module name="capicon" type="win32cui" installbase="system32" installname="capicon.exe">
+<module name="capicon" type="win32cui" installbase="system32" installname="capicon.exe" unicode="true">
 	<include base="capicon">.</include>
-	<define name="__USE_W32API" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/win32/user32/kbdlayout/kbdlayout.rbuild

@@ -1,7 +1,5 @@
 <module name="kbdlayout" type="win32gui" installbase="system32" installname="kbdlayout.exe">
 	<include base="kbdlayout">.</include>
-	<define name="__USE_W32API" />
-	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

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;

rostests/win32/user32/sysicon/sysicon.rbuild

@@ -1,8 +1,5 @@
-<module name="sysicon" type="win32gui" installbase="system32" installname="sysicon.exe">
+<module name="sysicon" type="win32gui" installbase="system32" installname="sysicon.exe" unicode="true">
 	<include base="capicon">.</include>
-	<define name="__USE_W32API" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

rostests/win32/win32k/win32k.rbuild

@@ -4,11 +4,6 @@
 	<include base="win32k">include</include>
 	<include base="ntoskrnl">include</include>
 	<include base="freetype">include</include>
-	<define name="UNICODE" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="WINVER">0x600</define>
-	<define name="_SEH_NO_NATIVE_NLG" />
 	<define name="_WIN32K_" />
 	<library>rtshared</library>
 	<library>regtests</library>

rostests/winetests/GUI/GUI.rbuild

@@ -3,7 +3,7 @@
 <module name="GUI" type="win32gui" installbase="system32" installname="testGUI.exe" allowwarnings="true" unicode="yes">
 	<include base="GUI">.</include>
 	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
+	<redefine name="_WIN32_WINNT">0x501</redefine>
     <define name="__ROS_LONG64__" />
 	<library>gdi32</library>
 	<library>kernel32</library>

rostests/winetests/advapi32/advapi32.rbuild

@@ -2,9 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="advapi32_winetest" type="win32cui" installbase="bin" installname="advapi32_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="advapi32_winetest">.</include>
-    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>advapi32</library>
     <library>kernel32</library>

rostests/winetests/advpack/advpack.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="advpack_winetest" type="win32cui" installbase="bin" installname="advpack_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="advpack_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>advpack.c</file>

rostests/winetests/browseui/browseui.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="browseui_winetest" type="win32cui" installbase="bin" installname="browseui_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="browseui_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<library>wine</library>

rostests/winetests/cabinet/cabinet.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="cabinet_winetest" type="win32cui" installbase="bin" installname="cabinet_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="cabinet_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>extract.c</file>

rostests/winetests/comcat/comcat.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="comcat_winetest" type="win32cui" installbase="bin" installname="comcat_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="comcat_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>comcat.c</file>

rostests/winetests/comdlg32/comdlg32.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="comdlg32_winetest" type="win32cui" installbase="bin" installname="comdlg32_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="comdlg32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>filedlg.c</file>

rostests/winetests/crypt32/crypt32.rbuild

@@ -2,8 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="crypt32_winetest" type="win32cui" installbase="bin" installname="crypt32_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="crypt32_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>base64.c</file>
 	<file>cert.c</file>
 	<file>chain.c</file>

rostests/winetests/gdi32/gdi32.rbuild

@@ -2,10 +2,9 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="gdi32_winetest" type="win32cui" installbase="bin" installname="gdi32_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
+    <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="gdi32_winetest">.</include>
     <define name="__ROS_LONG64__" />
-    <define name="__USE_W32API" />
     <library>ntdll</library>
     <library>gdi32</library>
     <library>kernel32</library>

rostests/winetests/gdiplus/gdiplus.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="gdiplus_winetest" type="win32cui" installbase="bin" installname="gdiplus_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="gdiplus_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>brush.c</file>

rostests/winetests/hlink/hlink.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="hlink_winetest" type="win32cui" installbase="bin" installname="hlink_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="hlink_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>hlink.c</file>

rostests/winetests/icmp/icmp.rbuild

@@ -2,9 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="icmp_winetest" type="win32cui" installbase="bin" installname="icmp_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="icmp_winetest">.</include>
-    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>kernel32</library>
     <library>ntdll</library>

rostests/winetests/imm32/imm32.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="imm32_winetest" type="win32cui" installbase="bin" installname="imm32_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="imm32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>imm32.c</file>

rostests/winetests/iphlpapi/iphlpapi.rbuild

@@ -2,8 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="iphlpapi_winetest" type="win32cui" installbase="bin" installname="iphlpapi_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="iphlpapi_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>iphlpapi.c</file>
 	<file>testlist.c</file>
 	<library>wine</library>

rostests/winetests/jscript/jscript.rbuild

@@ -2,8 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="jscript_winetest" type="win32cui" installbase="bin" installname="jscript_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="jscript_winetest">.</include>
+    <define name="__ROS_LONG64__" />
 	<file>jscript.c</file>
 	<file>run.c</file>
 	<file>testlist.c</file>

rostests/winetests/kernel32/kernel32.rbuild

@@ -4,7 +4,6 @@
 <module name="kernel32_winetest" type="win32cui" installbase="bin" installname="kernel32_winetest.exe" allowwarnings="true">
     <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="kernel32_winetest">.</include>
-    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>ntdll</library>
     <library>kernel32</library>
@@ -43,6 +42,5 @@
     <file>virtual.c</file>
     <file>volume.c</file>
     <file>testlist.c</file>
-    <file>resource.rc</file>
 </module>
 </group>

rostests/winetests/lz32/lz32.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="lz32_winetest" type="win32cui" installbase="bin" installname="lz32_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="lz32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>lzexpand_main.c</file>

rostests/winetests/mapi32/mapi32.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mapi32_winetest" type="win32cui" installbase="bin" installname="mapi32_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="mapi32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>imalloc.c</file>

rostests/winetests/mlang/mlang.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mlang_winetest" type="win32cui" installbase="bin" installname="mlang_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="mlang_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<file>mlang.c</file>

rostests/winetests/msacm32/msacm32.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msacm32_winetest" type="win32cui" installbase="bin" installname="msacm32_winetest.exe" allowwarnings="true">
-	<compilerflag compiler="cc">-Wno-format</compilerflag>
 	<include base="msacm32_winetest">.</include>
     <define name="__ROS_LONG64__" />
 	<library>wine</library>