Supersedes r40536, r40537

modified   winetests/advpack/advpack.rbuild
modified   winetests/browseui/browseui.rbuild
modified   winetests/cabinet/cabinet.rbuild
modified   winetests/comcat/comcat.rbuild
modified   winetests/comdlg32/comdlg32.rbuild
modified   winetests/gdiplus/gdiplus.rbuild
modified   winetests/hlink/hlink.rbuild
modified   winetests/imm32/imm32.rbuild
modified   winetests/lz32/lz32.rbuild
modified   winetests/mapi32/mapi32.rbuild
modified   winetests/mlang/mlang.rbuild
modified   winetests/msacm32/msacm32.rbuild
modified   winetests/mshtml/mshtml.rbuild
modified   winetests/msi/msi.rbuild
modified   winetests/mstask/mstask.rbuild
modified   winetests/netapi32/netapi32.rbuild
modified   winetests/odbccp32/odbccp32.rbuild
modified   winetests/ole32/ole32.rbuild
modified   winetests/rsabase/rsabase.rbuild
modified   winetests/rsaenh/rsaenh.rbuild
modified   winetests/schannel/schannel.rbuild
modified   winetests/shell32/shell32.rbuild
modified   winetests/shlwapi/shlwapi.rbuild
modified   winetests/urlmon/urlmon.rbuild
modified   winetests/usp10/usp10.rbuild
modified   winetests/uxtheme/uxtheme.rbuild
modified   winetests/version/version.rbuild
modified   winetests/winhttp/winhttp.rbuild
modified   winetests/wininet/wininet.rbuild
   -Wno-format no longer necessary

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=40623

rostests/apitests/dciman32api/dciman32api.rbuild

@@ -1,6 +1,5 @@
 <module name="dciman32api" type="win32cui">
 	<include base="dciman32api">.</include>
-	<define name="__USE_W32API" />
 	<library>apitest</library>
 	<library>kernel32</library>
 	<library>user32</library>

rostests/apitests/directory.rbuild

@@ -3,7 +3,6 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="apitest" type="staticlibrary">
 		<include base="apitest">.</include>
-		<define name="__USE_W32API" />
 		<file>apitest.c</file>
 	</module>
 
@@ -26,7 +25,7 @@
 	<directory name="w32knapi">
 		<xi:include href="w32knapi/w32knapi.rbuild" />
 	</directory>
-	
+
 	<directory name="ws2_32">
 		<xi:include href="ws2_32/ws2_32.rbuild" />
 	</directory>

rostests/apitests/gdi32api/gdi32api.rbuild

@@ -1,6 +1,5 @@
 <module name="gdi32api" type="win32cui">
 	<include base="gdi32api">.</include>
-	<define name="__USE_W32API" />
 	<library>apitest</library>
 	<library>kernel32</library>
 	<library>user32</library>

rostests/apitests/user32api/user32api.rbuild

@@ -1,6 +1,5 @@
 <module name="user32api" type="win32cui">
 	<include base="user32api">.</include>
-	<define name="__USE_W32API" />
 	<library>apitest</library>
 	<library>kernel32</library>
 	<library>user32</library>

rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild

@@ -1,6 +1,5 @@
 <module name="w32kdll_2k3sp2" type="win32dll" entrypoint="0" installname="w32kdll_2k3sp2.dll">
 	<importlibrary definition="w32kdll_2k3sp2.def" />
-	<define name="__USE_W32API" />
 	<file>w32kdll_2k3sp2.S</file>
 	<file>main.c</file>
 </module>

rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.rbuild

@@ -1,6 +1,5 @@
 <module name="w32kdll_2ksp4" type="win32dll" entrypoint="0" installname="w32kdll_2ksp4.dll">
 	<importlibrary definition="w32kdll_2ksp4.def" />
-	<define name="__USE_W32API" />
 	<file>w32kdll_2ksp4.S</file>
 	<file>main.c</file>
 </module>

rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild

@@ -1,6 +1,5 @@
 <module name="w32kdll" type="win32dll" entrypoint="0" installname="w32kdll.dll">
 	<importlibrary definition="w32kdll_ros.def" />
-	<define name="__USE_W32API" />
 	<library>win32ksys</library>
 	<file>main.c</file>
 </module>

rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild

@@ -1,6 +1,5 @@
 <module name="w32kdll_vista" type="win32dll" entrypoint="0" installname="w32kdll_vista.dll">
 	<importlibrary definition="w32kdll_vista.def" />
-	<define name="__USE_W32API" />
 	<file>w32kdll_vista.S</file>
 	<file>main.c</file>
 </module>

rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.rbuild

@@ -1,6 +1,5 @@
 <module name="w32kdll_xpsp2" type="win32dll" entrypoint="0" installname="w32kdll_xpsp2.dll">
 	<importlibrary definition="w32kdll_xpsp2.def" />
-	<define name="__USE_W32API" />
 	<file>w32kdll_xpsp2.S</file>
 	<file>main.c</file>
 </module>

rostests/apitests/w32knapi/w32knapi.rbuild

@@ -1,6 +1,5 @@
 <module name="w32knapi" type="win32cui">
 	<include base="w32knapi">.</include>
-	<define name="__USE_W32API" />
 	<library>apitest</library>
 	<library>ntdll</library>
 	<library>kernel32</library>

rostests/dibtests/alphablend/alphablend.rbuild

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

rostests/dibtests/bitblt/bitblt.rbuild

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

rostests/dibtests/bltrop/bltrop.rbuild

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

rostests/dibtests/dibtest/dibtest.rbuild

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

rostests/dibtests/icontest/icontest.rbuild

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

rostests/dibtests/palbitblt/palbitblt.rbuild

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

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/dibtests/vbltest/vbltest.rbuild

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

rostests/drivers/csqtest/csqtest.rbuild

@@ -1,6 +1,5 @@
 <module name="csqtest" type="kernelmodedriver" installbase="system32/drivers" installname="csqtest.sys">
 	<bootstrap base="$(CDOUTPUT)" />
-	<define name="__USE_W32API" />
 	<include base="ReactOS">include/reactos/drivers</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>

rostests/drivers/kmtest/kmtest.rbuild

@@ -1,6 +1,5 @@
 <module name="kmtest" type="kernelmodedriver" installbase="system32/drivers" installname="kmtest.sys">
 	<bootstrap base="$(CDOUTPUT)" />
-	<define name="__USE_W32API" />
 	<include base="ReactOS">include/reactos/drivers</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>

rostests/drivers/memtest/memtest.rbuild

@@ -1,6 +1,5 @@
 <module name="memtest" type="kernelmodedriver" installbase="system32/drivers" installname="memtest.sys">
 	<bootstrap base="reactos" />
-        <define name="__USE_W32API" />
 	<include base="ReactOS">include/reactos/drivers</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>

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/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild

@@ -1,5 +1,4 @@
 <module name="D3DParseUnknownCommand_show" type="win32cui" installbase="bin" installname="D3DParseUnknownCommand_show.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>ddraw</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/accelerator/accelerator.rbuild

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

rostests/tests/alive/alive.rbuild

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

rostests/tests/apc/apc.rbuild

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

rostests/tests/apc2/apc2.rbuild

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

rostests/tests/args/args.rbuild

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

rostests/tests/atomtest/atomtest.rbuild

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

rostests/tests/bench/bench.rbuild

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

rostests/tests/button/button.rbuild

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

rostests/tests/button2/button2.rbuild

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

rostests/tests/capclock/capclock.rbuild

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

rostests/tests/carets/carets.rbuild

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

rostests/tests/combotst/combotst.rbuild

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

rostests/tests/consume/consume.rbuild

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

rostests/tests/copymove/copymove.rbuild

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

rostests/tests/count/count.rbuild

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

rostests/tests/create-links/create-links.rbuild

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

rostests/tests/dirdlg/dirdlg.rbuild

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

rostests/tests/diskspeed/diskspeed.rbuild

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

rostests/tests/dnsapi/dnsapi.rbuild

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

rostests/tests/dnsquery/dnsquery.rbuild

@@ -1,5 +1,4 @@
 <module name="dnsquery" type="win32gui" installbase="bin" installname="dnsquery.exe">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>dnsapi</library>
 	<library>ws2_32</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>