This is why we can't have nice things. Reverting r40536, r40537, due to RosBE differe...
authorKJK::Hyperion <hackbunny@reactos.org>
Thu, 16 Apr 2009 04:57:28 +0000 (04:57 +0000)
committerKJK::Hyperion <hackbunny@reactos.org>
Thu, 16 Apr 2009 04:57:28 +0000 (04:57 +0000)
svn path=/trunk/; revision=40541

165 files changed:
rostests/apitests/dciman32api/dciman32api.rbuild
rostests/apitests/directory.rbuild
rostests/apitests/gdi32api/gdi32api.rbuild
rostests/apitests/user32api/user32api.rbuild
rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild
rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.rbuild
rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild
rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.rbuild
rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.rbuild
rostests/apitests/w32knapi/w32knapi.rbuild
rostests/dibtests/alphablend/alphablend.rbuild
rostests/dibtests/bitblt/bitblt.rbuild
rostests/dibtests/bltrop/bltrop.rbuild
rostests/dibtests/dibtest/dibtest.rbuild
rostests/dibtests/icontest/icontest.rbuild
rostests/dibtests/palbitblt/palbitblt.rbuild
rostests/dibtests/patblt/patblt.rbuild
rostests/dibtests/stretchblt/stretchblt.rbuild
rostests/dibtests/vbltest/vbltest.rbuild
rostests/drivers/csqtest/csqtest.rbuild
rostests/drivers/kmtest/kmtest.rbuild
rostests/drivers/memtest/memtest.rbuild
rostests/dxtest/ddraw/ddraw.rbuild
rostests/tests/D3DParseUnknownCommand_show/D3DParseUnknownCommand_show.rbuild
rostests/tests/DxHalTest/DxHalTest.rbuild
rostests/tests/Imagelistviewer/imagelistviewer.rbuild
rostests/tests/accelerator/accelerator.rbuild
rostests/tests/alive/alive.rbuild
rostests/tests/apc/apc.rbuild
rostests/tests/apc2/apc2.rbuild
rostests/tests/args/args.rbuild
rostests/tests/atomtest/atomtest.rbuild
rostests/tests/bench/bench.rbuild
rostests/tests/button/button.rbuild
rostests/tests/button2/button2.rbuild
rostests/tests/capclock/capclock.rbuild
rostests/tests/carets/carets.rbuild
rostests/tests/combotst/combotst.rbuild
rostests/tests/consume/consume.rbuild
rostests/tests/copymove/copymove.rbuild
rostests/tests/count/count.rbuild
rostests/tests/create-links/create-links.rbuild
rostests/tests/dirdlg/dirdlg.rbuild
rostests/tests/diskspeed/diskspeed.rbuild
rostests/tests/dnsapi/dnsapi.rbuild
rostests/tests/dnsquery/dnsquery.rbuild
rostests/tests/edit/edit.rbuild
rostests/tests/enhmetafile/enhmetafile.rbuild
rostests/tests/enumfonts/enumfonts.rbuild
rostests/tests/enumwnd/enumwnd.rbuild
rostests/tests/enumws/enumws.rbuild
rostests/tests/event/event.rbuild
rostests/tests/fiber/fiber.rbuild
rostests/tests/gethostbyname/gethostbyname.rbuild
rostests/tests/global_mem/global_mem.rbuild
rostests/tests/gradient/gradient.rbuild
rostests/tests/guithreadinfo/guithreadinfo.rbuild
rostests/tests/hello/hello.rbuild
rostests/tests/hivetest/hivetest.rbuild
rostests/tests/iptest/iptest.rbuild
rostests/tests/isotest/isotest.rbuild
rostests/tests/lantst/lantest.rbuild
rostests/tests/lineclip/lineclip.rbuild
rostests/tests/linetest/linetest.rbuild
rostests/tests/lpctst/lpctst.rbuild
rostests/tests/map_dup_inherit/map_dup_inherit.rbuild
rostests/tests/mdi/mdi.rbuild
rostests/tests/miditest/miditest.rbuild
rostests/tests/mktime/mktime.rbuild
rostests/tests/moztest/moztest.rbuild
rostests/tests/mstest/mstest.rbuild
rostests/tests/multithrdwin/multithrdwin.rbuild
rostests/tests/multiwin/multiwin.rbuild
rostests/tests/mutex/mutex.rbuild
rostests/tests/nameserverlist/nameserverlist.rbuild
rostests/tests/noexecute/noexecute.rbuild
rostests/tests/nptest/nptest.rbuild
rostests/tests/oskittcp/oskittcp.rbuild
rostests/tests/p_dup_handle/p_dup_handle.rbuild
rostests/tests/polytest/polytest.rbuild
rostests/tests/popupmenu/popupmenu.rbuild
rostests/tests/primitives/primitives.rbuild
rostests/tests/pteb/pteb.rbuild
rostests/tests/readconsole/readconsole.rbuild
rostests/tests/regdump/regdump.rbuild
rostests/tests/regqueryvalue/regqueryvalue.rbuild
rostests/tests/regtest/regtest.rbuild
rostests/tests/sectest/sectest.rbuild
rostests/tests/sertest/sertest.rbuild
rostests/tests/shaptest/shaptest.rbuild
rostests/tests/shm/shm.rbuild
rostests/tests/statst/statst.rbuild
rostests/tests/statst2/statst2.rbuild
rostests/tests/subclass/subclass.rbuild
rostests/tests/suspend/suspend.rbuild
rostests/tests/tcpsvr/tcpsvr.rbuild
rostests/tests/terminate/terminate.rbuild
rostests/tests/thread/thread.rbuild
rostests/tests/thread_msg/thread_msg.rbuild
rostests/tests/threadwait/threadwait.rbuild
rostests/tests/tmrqueue/tmrqueue.rbuild
rostests/tests/tokentest/tokentest.rbuild
rostests/tests/txtscale/txtscale.rbuild
rostests/tests/vmtest/vmtest.rbuild
rostests/tests/wclickat/wclickat.rbuild
rostests/tests/winhello/winhello.rbuild
rostests/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
rostests/tests/wm_paint/wm_paint.rbuild
rostests/tests/wpickclick/wpickclick.rbuild
rostests/tests/zwcontinue/zwcontinue.rbuild
rostests/win32/cmd/cmd_test.rbuild
rostests/win32/kernel32/queuetest/queuetest.rbuild
rostests/win32/kmtloader/kmtloader.rbuild
rostests/win32/smss/movefile/movefile.rbuild
rostests/win32/user32/drawcaption/capicon.c
rostests/win32/user32/drawcaption/drawcap.c
rostests/win32/user32/drawcaption/drawcaption.rbuild
rostests/win32/user32/kbdlayout/kbdlayout.rbuild
rostests/win32/user32/sysicon/sysicon.c
rostests/win32/user32/sysicon/sysicon.rbuild
rostests/win32/win32k/win32k.rbuild
rostests/winetests/GUI/GUI.rbuild
rostests/winetests/advapi32/advapi32.rbuild
rostests/winetests/advpack/advpack.rbuild
rostests/winetests/browseui/browseui.rbuild
rostests/winetests/cabinet/cabinet.rbuild
rostests/winetests/comcat/comcat.rbuild
rostests/winetests/comdlg32/comdlg32.rbuild
rostests/winetests/crypt32/crypt32.rbuild
rostests/winetests/gdi32/gdi32.rbuild
rostests/winetests/gdiplus/gdiplus.rbuild
rostests/winetests/hlink/hlink.rbuild
rostests/winetests/icmp/icmp.rbuild
rostests/winetests/imm32/imm32.rbuild
rostests/winetests/iphlpapi/iphlpapi.rbuild
rostests/winetests/jscript/jscript.rbuild
rostests/winetests/kernel32/kernel32.rbuild
rostests/winetests/lz32/lz32.rbuild
rostests/winetests/mapi32/mapi32.rbuild
rostests/winetests/mlang/mlang.rbuild
rostests/winetests/msacm32/msacm32.rbuild
rostests/winetests/mshtml/mshtml.rbuild
rostests/winetests/msi/msi.rbuild
rostests/winetests/mstask/mstask.rbuild
rostests/winetests/msvcrt/msvcrt.rbuild
rostests/winetests/netapi32/netapi32.rbuild
rostests/winetests/ntdll/ntdll.rbuild
rostests/winetests/odbccp32/odbccp32.rbuild
rostests/winetests/ole32/ole32.rbuild
rostests/winetests/powrprof/powrprof.rbuild
rostests/winetests/psapi/psapi.rbuild
rostests/winetests/rpcrt4/rpcrt4.rbuild
rostests/winetests/rsabase/rsabase.rbuild
rostests/winetests/rsaenh/rsaenh.rbuild
rostests/winetests/schannel/schannel.rbuild
rostests/winetests/setupapi/setupapi.rbuild
rostests/winetests/shell32/shell32.rbuild
rostests/winetests/shlwapi/shlwapi.rbuild
rostests/winetests/urlmon/urlmon.rbuild
rostests/winetests/user32/user32.rbuild
rostests/winetests/usp10/usp10.rbuild
rostests/winetests/uxtheme/uxtheme.rbuild
rostests/winetests/version/version.rbuild
rostests/winetests/winhttp/winhttp.rbuild
rostests/winetests/wininet/wininet.rbuild

index 29adf5e..c20ca20 100644 (file)
@@ -1,5 +1,6 @@
 <module name="dciman32api" type="win32cui">
        <include base="dciman32api">.</include>
+       <define name="__USE_W32API" />
        <library>apitest</library>
        <library>kernel32</library>
        <library>user32</library>
index fca322c..ff60143 100644 (file)
@@ -3,6 +3,7 @@
 <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>
 
@@ -25,7 +26,7 @@
        <directory name="w32knapi">
                <xi:include href="w32knapi/w32knapi.rbuild" />
        </directory>
-
+       
        <directory name="ws2_32">
                <xi:include href="ws2_32/ws2_32.rbuild" />
        </directory>
index ec234cd..61acef1 100644 (file)
@@ -1,5 +1,6 @@
 <module name="gdi32api" type="win32cui">
        <include base="gdi32api">.</include>
+       <define name="__USE_W32API" />
        <library>apitest</library>
        <library>kernel32</library>
        <library>user32</library>
index 7781240..ceb4607 100644 (file)
@@ -1,5 +1,6 @@
 <module name="user32api" type="win32cui">
        <include base="user32api">.</include>
+       <define name="__USE_W32API" />
        <library>apitest</library>
        <library>kernel32</library>
        <library>user32</library>
index 5876d07..eac5ce3 100644 (file)
@@ -1,5 +1,6 @@
 <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>
index 2083f95..1434dac 100644 (file)
@@ -1,5 +1,6 @@
 <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>
index b81ecad..14575cc 100644 (file)
@@ -1,5 +1,6 @@
 <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>
index 68c9b18..2856d9e 100644 (file)
@@ -1,5 +1,6 @@
 <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>
index d3467c4..e1f324d 100644 (file)
@@ -1,5 +1,6 @@
 <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>
index 3f662ed..197832c 100644 (file)
@@ -1,5 +1,6 @@
 <module name="w32knapi" type="win32cui">
        <include base="w32knapi">.</include>
+       <define name="__USE_W32API" />
        <library>apitest</library>
        <library>ntdll</library>
        <library>kernel32</library>
index 93aa2f9..180b301 100644 (file)
@@ -1,4 +1,5 @@
 <module name="alphablend" type="win32gui" installbase="bin" installname="alphablend.exe">
+       <define name="__USE_W32API" />
        <include base="alphablend">.</include>
        <library>kernel32</library>
        <library>user32</library>
index b1edc26..b73af24 100644 (file)
@@ -1,4 +1,5 @@
 <module name="bitblt" type="win32gui" installbase="bin" installname="bitblt.exe">
+       <define name="__USE_W32API" />
        <include base="bitblt">.</include>
        <library>kernel32</library>
        <library>user32</library>
index f90a27e..9d1fd25 100644 (file)
@@ -1,4 +1,5 @@
 <module name="bltrop" type="win32gui" installbase="bin" installname="bltrop.exe">
+       <define name="__USE_W32API" />
        <include base="bltrop">.</include>
        <library>kernel32</library>
        <library>gdi32</library>
index 8fdd3d8..48653d8 100644 (file)
@@ -1,4 +1,5 @@
 <module name="dibtest" type="win32gui" installbase="bin" installname="dibtest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 123afc2..37c01a5 100644 (file)
@@ -1,4 +1,5 @@
 <module name="icontest" type="win32gui" installbase="bin" installname="icontest.exe">
+       <define name="__USE_W32API" />
        <include base="icontest">.</include>
        <library>kernel32</library>
        <library>user32</library>
index cfbe602..badd99a 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index 3017fc9..628d07f 100644 (file)
@@ -1,6 +1,8 @@
 <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>
index 1fa762e..b2589c0 100644 (file)
@@ -1,6 +1,8 @@
 <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>
index 75b26c9..5b8a0bb 100644 (file)
@@ -1,4 +1,5 @@
 <module name="vbltest" type="win32gui" installbase="bin" installname="vbltest.exe">
+       <define name="__USE_W32API" />
        <include base="vbltest">.</include>
        <library>kernel32</library>
        <library>user32</library>
index 222924a..4dd069c 100644 (file)
@@ -1,5 +1,6 @@
 <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>
index 4b9a036..23a6554 100644 (file)
@@ -1,5 +1,6 @@
 <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>
index 61cb6fe..e2f9bef 100644 (file)
@@ -1,5 +1,6 @@
 <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>
index ba4507e..dcc8718 100644 (file)
@@ -1,5 +1,6 @@
-<module name="ddraw_test" type="win32cui" allowwarnings="false">\r
+<module name="ddraw_test" type="win32cui" allowwarnings="true">\r
        <include base="ddraw_test">.</include>\r
+       <define name="__USE_W32API" />\r
        <library>kernel32</library>\r
        <library>user32</library>\r
        <library>gdi32</library>\r
index 36d8310..633b356 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index e3465fd..6241a30 100644 (file)
@@ -1,4 +1,5 @@
 <module name="dxhaltest" type="win32cui" installbase="bin" installname="dxhaltest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 8dc1073..7abf5fe 100644 (file)
@@ -1,4 +1,5 @@
 <module name="Imagelistviewer" type="win32gui" installbase="bin" installname="Imagelistviewer.exe">\r
+       <define name="__USE_W32API" />\r
        <include base="Imagelistviewer">.</include>\r
        <library>kernel32</library>\r
        <library>user32</library>\r
index 245b677..370a257 100644 (file)
@@ -1,4 +1,5 @@
 <module name="accelerator" type="win32gui" installbase="bin" installname="accelerator.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 0888f4a..8a7c2a3 100644 (file)
@@ -1,4 +1,5 @@
 <module name="alive" type="win32cui" installbase="bin" installname="alive.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 8e31f90..084fb17 100644 (file)
@@ -1,4 +1,5 @@
 <module name="apc" type="win32cui" installbase="bin" installname="apc.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>ntdll</library>
        <file>apc.c</file>
index 25d8a34..8f7b765 100644 (file)
@@ -1,4 +1,5 @@
 <module name="apc2" type="win32cui" installbase="bin" installname="apc2.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <file>apc2.c</file>
 </module>
index 9fc67e1..9f5d22d 100644 (file)
@@ -1,4 +1,5 @@
 <module name="args" type="win32cui" installbase="bin" installname="args.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <file>args.c</file>
 </module>
index a08c5e2..21c9de6 100644 (file)
@@ -1,4 +1,5 @@
 <module name="atomtest" type="win32cui" installbase="bin" installname="atomtest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>ntdll</library>
        <file>atomtest.c</file>
index 0ea1dbd..8468e04 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index 10a30e7..a86fb19 100644 (file)
@@ -1,4 +1,5 @@
 <module name="button" type="win32gui" installbase="bin" installname="button.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 8b2915e..01c0b91 100644 (file)
@@ -1,4 +1,5 @@
 <module name="buttontst2" type="win32gui" installbase="bin" installname="buttontst2.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 5b1e6ce..afe112f 100644 (file)
@@ -1,4 +1,5 @@
 <module name="capclock" type="win32gui" installbase="bin" installname="capclock.exe">
+       <define name="__USE_W32API" />
        <include base="capclock">.</include>
        <library>kernel32</library>
        <library>user32</library>
index a4efaca..064735c 100644 (file)
@@ -1,4 +1,5 @@
 <module name="carets" type="win32gui" installbase="bin" installname="carets.exe">
+       <define name="__USE_W32API" />
        <include base="carets">.</include>
        <library>kernel32</library>
        <library>user32</library>
index e22dd0a..1daa272 100644 (file)
@@ -1,4 +1,5 @@
 <module name="combotst" type="win32gui" installbase="bin" installname="combotst.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index a37f693..b515f41 100644 (file)
@@ -1,4 +1,5 @@
 <module name="consume" type="win32cui" installbase="bin" installname="consume.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>consume.c</file>
index 9644f80..9613bd1 100644 (file)
@@ -1,4 +1,5 @@
 <module name="copymove" type="win32cui" installbase="bin" installname="copymove.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>copymove.c</file>
index 5551dc0..a858639 100644 (file)
@@ -1,4 +1,5 @@
 <module name="count" type="win32cui" installbase="bin" installname="count.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>count.c</file>
index a6c901c..6e9ba0d 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index fd90b46..e80909b 100644 (file)
@@ -1,4 +1,5 @@
 <module name="dirdlg" type="win32gui" installbase="bin" installname="dirdlg.exe">
+       <define name="__USE_W32API" />
        <include base="dirdlg">.</include>
        <library>kernel32</library>
        <library>user32</library>
index 0f24bc6..b119d66 100644 (file)
@@ -1,4 +1,5 @@
 <module name="diskspeed" type="win32cui" installbase="bin" installname="diskspeed.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>diskspeed.c</file>
index 3dead46..ddc3e90 100644 (file)
@@ -1,4 +1,5 @@
 <module name="dnsapitst" type="win32cui" installbase="bin" installname="dnsapitst.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>dnsapi</library>
        <library>ws2_32</library>
index 9883d97..506e29d 100644 (file)
@@ -1,4 +1,5 @@
 <module name="dnsquery" type="win32gui" installbase="bin" installname="dnsquery.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>dnsapi</library>
        <library>ws2_32</library>
index fbb833b..62b0d26 100644 (file)
@@ -1,4 +1,5 @@
 <module name="edit" type="win32gui" installbase="bin" installname="edit.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 92f4f4d..ef26fa7 100644 (file)
@@ -1,4 +1,5 @@
 <module name="enhmetafile" type="win32gui" installbase="bin" installname="enhmetafile.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index c6773b4..a49fa60 100644 (file)
@@ -1,6 +1,8 @@
 <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>
index c44ff09..6e2613f 100644 (file)
@@ -1,4 +1,5 @@
 <module name="enumwnd" type="win32gui" installbase="bin" installname="enumwnd.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index f58aeff..f36710a 100644 (file)
@@ -1,4 +1,5 @@
 <module name="enumws" type="win32gui" installbase="bin" installname="enumws.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 53c6eea..f1d9211 100644 (file)
@@ -1,4 +1,5 @@
 <module name="event" type="win32gui" installbase="bin" installname="event.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>event.c</file>
index 02e52ea..e638682 100644 (file)
@@ -1,4 +1,5 @@
 <module name="fiber" type="win32cui" installbase="bin" installname="fiber.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>fiber.c</file>
index e3caab9..252d4eb 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index 6fbddd9..7dda70d 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index b15629c..e89f124 100644 (file)
@@ -1,4 +1,5 @@
 <module name="gradient" type="win32gui" installbase="bin" installname="gradient.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 7239779..ee7ed42 100644 (file)
@@ -1,4 +1,5 @@
 <module name="guithreadinfo" type="win32gui" installbase="bin" installname="guithreadinfo.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>guithreadinfo.c</file>
index 8b126e1..918d590 100644 (file)
@@ -1,4 +1,5 @@
 <module name="hello" type="win32cui" installbase="bin" installname="hello.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 34ad447..acc8a74 100644 (file)
@@ -1,4 +1,5 @@
 <module name="hivetest" type="win32gui" installbase="bin" installname="hivetest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>ntdll</library>
index 3baa33d..bbf7bd4 100644 (file)
@@ -1,4 +1,5 @@
 <module name="iptest" type="win32gui" installbase="bin" installname="iptest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>iptest.cpp</file>
index a3f5921..5b4cbb8 100644 (file)
@@ -1,4 +1,5 @@
 <module name="isotest" type="win32cui" installbase="bin" installname="isotest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>ntdll</library>
        <file>isotest.c</file>
index a1cfc27..919afc8 100644 (file)
@@ -1,4 +1,5 @@
 <module name="lantest" type="win32gui" installbase="bin" installname="lantest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>lantest.cpp</file>
index c631a8a..c1824d1 100644 (file)
@@ -1,4 +1,5 @@
 <module name="lineclip" type="win32gui" installbase="bin" installname="lineclip.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 9efb94a..bbe598b 100644 (file)
@@ -1,4 +1,5 @@
 <module name="linetest" type="win32gui" installbase="bin" installname="linetest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index b293668..c6ccf3c 100644 (file)
@@ -1,4 +1,5 @@
 <module name="lpctst" type="win32gui" installbase="bin" installname="lpctst.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>lpctst.c</file>
index 9429d5e..7f0ec15 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index 98ed290..f1ef075 100644 (file)
@@ -1,4 +1,6 @@
 <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>
index 9103c3b..18bdd93 100644 (file)
@@ -1,4 +1,6 @@
 <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>
index 4a5fee2..c257236 100644 (file)
@@ -1,4 +1,5 @@
 <module name="mktime" type="win32gui" installbase="bin" installname="mktime.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>mktime.c</file>
index facd6f5..1c8fee6 100644 (file)
@@ -1,4 +1,5 @@
 <module name="moztest" type="win32cui" installbase="bin" installname="moztest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>ntdll</library>
        <library>ws2_32</library>
index 62e7b39..1c27f59 100644 (file)
@@ -1,4 +1,5 @@
 <module name="mstest" type="win32gui" installbase="bin" installname="mstest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>mstest.c</file>
index 86a6b73..2f6bcfa 100644 (file)
@@ -1,4 +1,5 @@
 <module name="multithrdwin" type="win32gui" installbase="bin" installname="multithrdwin.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index d585e37..355f886 100644 (file)
@@ -1,4 +1,5 @@
 <module name="multiwin" type="win32gui" installbase="bin" installname="multiwin.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 8c6cb6e..1000ad3 100644 (file)
@@ -1,4 +1,5 @@
 <module name="mutex" type="win32gui" installbase="bin" installname="mutex.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>mutex.c</file>
index 8c22945..49323bd 100644 (file)
@@ -1,4 +1,5 @@
 <module name="nameserverlist" type="win32cui" installbase="bin" installname="nameserverlist.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>iphlpapi</library>
        <file>nameserverlist.c</file>
index e543938..1cdee3b 100644 (file)
@@ -1,4 +1,5 @@
 <module name="noexecute" type="win32cui" installbase="bin" installname="noexecute.exe">
+       <define name="__USE_W32API" />
        <library>pseh</library>
        <library>kernel32</library>
        <library>user32</library>
index 88d772d..84d3318 100644 (file)
@@ -1,4 +1,5 @@
 <module name="nptest" type="win32gui" installbase="bin" installname="nptest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>nptest.c</file>
index 21e7ef0..8ec4cd6 100644 (file)
@@ -1,4 +1,5 @@
 <module name="oskittcptst" type="win32gui" installbase="bin" installname="tcptest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>tcptest.cpp</file>
index 5bcead2..ba5d384 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index e94ad02..03fb472 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index 1b8e6ac..0373de5 100644 (file)
@@ -1,4 +1,5 @@
 <module name="popupmenu" type="win32gui" installbase="bin" installname="popupmenu.exe">
+       <define name="__USE_W32API" />
        <include base="popupmenu">.</include>
        <library>kernel32</library>
        <library>user32</library>
index f9310e8..bcb14c0 100644 (file)
@@ -1,7 +1,9 @@
 <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>
index bf01de6..fd30384 100644 (file)
@@ -1,4 +1,5 @@
 <module name="pteb" type="win32gui" installbase="bin" installname="pteb.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>pteb.c</file>
index 31cdbc2..2a1512e 100644 (file)
@@ -1,4 +1,7 @@
 <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>
index e475c04..9778749 100644 (file)
@@ -1,4 +1,5 @@
 <module name="regdump" type="win32cui" installbase="bin" installname="regdump.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>advapi32</library>
        <library>gdi32</library>
index 482ada8..3b493cf 100644 (file)
@@ -1,4 +1,5 @@
 <module name="regqueryvalue" type="win32gui" installbase="bin" installname="regqueryvalue.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>advapi32</library>
index be8c2d6..1751d12 100644 (file)
@@ -1,4 +1,5 @@
 <module name="regtest" type="win32gui" installbase="bin" installname="regtest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>regtest.c</file>
index f26b607..8013b9c 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index eb50480..63d92bb 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index bca071b..a06bf5c 100644 (file)
@@ -1,4 +1,5 @@
 <module name="shaptest" type="win32gui" installbase="bin" installname="shaptest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 6e2bcbc..0f4efd9 100644 (file)
@@ -1,4 +1,5 @@
 <module name="shm" type="win32gui" installbase="bin" installname="shm.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>shm.c</file>
index 90f6315..07da4d0 100644 (file)
@@ -1,4 +1,5 @@
 <module name="statst" type="win32gui" installbase="bin" installname="statst.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 898ec41..55abda2 100644 (file)
@@ -1,4 +1,5 @@
 <module name="statst2" type="win32gui" installbase="bin" installname="statst2.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index fc3d9fa..84d1b71 100644 (file)
@@ -1,4 +1,5 @@
 <module name="subclass" type="win32gui" installbase="bin" installname="subclass.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 0d532e8..185f63a 100644 (file)
@@ -1,4 +1,5 @@
 <module name="suspend" type="win32gui" installbase="bin" installname="suspend.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>suspend.c</file>
index fe8ab81..58bf684 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index 750ac88..cde579a 100644 (file)
@@ -1,4 +1,5 @@
 <module name="terminate" type="win32cui" installbase="bin" installname="terminate.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>terminate.c</file>
index 3d3efdd..8580ac6 100644 (file)
@@ -1,4 +1,5 @@
 <module name="thread" type="win32gui" installbase="bin" installname="thread.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>thread.c</file>
index ed655fb..44ff078 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index ee97227..ed50113 100644 (file)
@@ -1,4 +1,5 @@
 <module name="threadwait" type="win32gui" installbase="bin" installname="threadwait.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>ntdll</library>
        <file>threadwait.c</file>
index 9d7e67a..ea44881 100644 (file)
@@ -1,4 +1,5 @@
 <module name="tmrqueue" type="win32gui" installbase="bin" installname="tmrqueue.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>tmrqueue.c</file>
index ecab481..8674629 100644 (file)
@@ -1,4 +1,5 @@
 <module name="tokentest" type="win32gui" installbase="bin" installname="tokentest.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>tokentest.c</file>
index 3be6889..400b9eb 100644 (file)
@@ -1,8 +1,10 @@
 <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>
index 2244040..7993de4 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index 0c08d47..0aeb7fe 100644 (file)
@@ -1,4 +1,5 @@
 <module name="wclickat" type="win32gui" installbase="bin" installname="wclickat.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index d18991f..a18c739 100644 (file)
@@ -1,4 +1,5 @@
 <module name="winhello" type="win32gui" installbase="bin" installname="winhello.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 4a3ab10..a509a11 100644 (file)
@@ -1,6 +1,8 @@
 <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>
index e9cf181..66e9e59 100644 (file)
@@ -1,4 +1,5 @@
 <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>
index 380964d..a7e1542 100644 (file)
@@ -1,4 +1,5 @@
 <module name="wpickclick" type="win32gui" installbase="bin" installname="wpickclick.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>wpickclick.c</file>
index 8eda36b..fb58880 100644 (file)
@@ -1,4 +1,5 @@
 <module name="zwcontinue" type="win32gui" installbase="bin" installname="zwcontinue.exe">
+       <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>gdi32</library>
        <file>zwcontinue.c</file>
index 954f929..57cdf55 100644 (file)
@@ -2,8 +2,9 @@
        <include base="rtshared">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <include base="cmd">.</include>
+       <define name="__USE_W32API" />
        <define name="ANONYMOUSUNIONS" />
-       <redefine name="_WIN32_WINNT">0x501</redefine>
+       <define name="_WIN32_WINNT">0x0501</define>
        <library>rtshared</library>
        <library>regtests</library>
        <library>cmd_base</library>
index 483e5d8..4b11aed 100644 (file)
@@ -1,4 +1,5 @@
 <module name="queuetest" type="win32cui" installbase="system32" installname="queuetest.exe">
+        <define name="__USE_W32API" />
        <library>kernel32</library>
        <file>queuetest.c</file>
 </module>
index fa40a2d..56afda2 100644 (file)
@@ -1,4 +1,5 @@
 <module name="kmtloader" type="win32cui" installbase="system32" installname="kmtloader.exe">
+        <define name="__USE_W32API" />
        <library>kernel32</library>
        <library>advapi32</library>
        <file>kmtloader.c</file>
index f3c763e..306005c 100644 (file)
@@ -1,5 +1,6 @@
 <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>
index c113b4d..cef5ca2 100644 (file)
@@ -63,7 +63,7 @@ LRESULT CALLBACK WndProc(HWND hWnd,
 }
 
 
-int wmain(int argc, wchar_t**argv)
+INT main(INT argc, CHAR **argv)
 {
        HWND hWnd;
        MSG msg;
@@ -83,7 +83,7 @@ int wmain(int argc, wchar_t**argv)
                return 0;
        }
 
-       testnum = _wtoi(argv[1]);
+       testnum = atoi(argv[1]);
        if(testnum < 1 || testnum > 5)
        {
                printf("Unknown test %d\n", testnum);
index 2e31ee4..601d49f 100644 (file)
@@ -180,7 +180,7 @@ LRESULT CALLBACK CaptWndProc(HWND hWnd,
 }
 
 
-int wmain(int argc, wchar_t**argv)
+INT main(INT argc, CHAR **argv)
 {
        HWND hWnd;
        MSG msg;
@@ -205,7 +205,7 @@ int wmain(int argc, wchar_t**argv)
                return 0;
        }
 
-       testnum = _wtoi(argv[1]);
+       testnum = atoi(argv[1]);
        if(testnum < 1 || testnum > 8)
        {
                printf("Unknown test %d\n", testnum);
index 7316fce..6a7a720 100644 (file)
@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <group>
-<module name="drawcap" type="win32cui" installbase="system32" installname="drawcap.exe" unicode="true">
+<module name="drawcap" type="win32cui" installbase="system32" installname="drawcap.exe">
        <include base="drawcap">.</include>
+       <define name="__USE_W32API" />
+       <define name="UNICODE" />
+       <define name="_UNICODE" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
        <file>drawcap.rc</file>
 </module>
 
-<module name="capicon" type="win32cui" installbase="system32" installname="capicon.exe" unicode="true">
+<module name="capicon" type="win32cui" installbase="system32" installname="capicon.exe">
        <include base="capicon">.</include>
+       <define name="__USE_W32API" />
+       <define name="UNICODE" />
+       <define name="_UNICODE" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index d2d1b58..fe7706e 100644 (file)
@@ -1,5 +1,7 @@
 <module name="kbdlayout" type="win32gui" installbase="system32" installname="kbdlayout.exe">\r
        <include base="kbdlayout">.</include>\r
+       <define name="__USE_W32API" />\r
+       <define name="_UNICODE" />\r
        <library>kernel32</library>\r
        <library>user32</library>\r
        <library>gdi32</library>\r
index 0e74fbb..84802a1 100644 (file)
@@ -66,9 +66,9 @@ LRESULT CALLBACK WndProc(HWND hWnd,
        return DefWindowProc(hWnd, msg, wParam, lParam);
 }
 
-int APIENTRY wWinMain(HINSTANCE hInst,
+int APIENTRY WinMain(HINSTANCE hInst,
     HINSTANCE hPrevInstance,
-    LPWSTR lpCmdLine,
+    LPSTR lpCmdLine,
     int nCmdShow)
 {
        HWND hWnd1, hWnd2, hWnd3;
index f711334..d3d088a 100644 (file)
@@ -1,5 +1,8 @@
-<module name="sysicon" type="win32gui" installbase="system32" installname="sysicon.exe" unicode="true">
+<module name="sysicon" type="win32gui" installbase="system32" installname="sysicon.exe">
        <include base="capicon">.</include>
+       <define name="__USE_W32API" />
+       <define name="UNICODE" />
+       <define name="_UNICODE" />
        <library>kernel32</library>
        <library>user32</library>
        <library>gdi32</library>
index 24a4102..41660f1 100644 (file)
@@ -4,6 +4,11 @@
        <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>
index 2e3722d..f73c7cb 100644 (file)
@@ -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>
-       <redefine name="_WIN32_WINNT">0x501</redefine>
+       <define name="_WIN32_WINNT">0x501</define>
     <define name="__ROS_LONG64__" />
        <library>gdi32</library>
        <library>kernel32</library>
index d78d2bc..651e745 100644 (file)
@@ -2,7 +2,9 @@
 <!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>
index c6b9566..5518c38 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index d6b5e37..6cb96de 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index 5ce09e6..50b2e27 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index ecf216d..56fad49 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index c2e5d0d..1462064 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index 3870f33..c92aa41 100644 (file)
@@ -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>
index c865e35..cc55487 100644 (file)
@@ -2,9 +2,10 @@
 <!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>
index 531e90b..02cbcfd 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index 7f77113..f4bf710 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index 827d44d..7363a2f 100644 (file)
@@ -2,7 +2,9 @@
 <!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>
index efd37b6..6b1434b 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index 644c9c0..3e0ce48 100644 (file)
@@ -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>
index b37bb04..2e1a1a5 100644 (file)
@@ -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>
index 8ea74c8..ccadc03 100644 (file)
@@ -4,6 +4,7 @@
 <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>
@@ -42,5 +43,6 @@
     <file>virtual.c</file>
     <file>volume.c</file>
     <file>testlist.c</file>
+    <file>resource.rc</file>
 </module>
 </group>
index f189ae9..d46524b 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index bf91266..1debf2e 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index 37b3b2a..0cd4a4e 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index 8dc0092..c2fe516 100644 (file)
@@ -2,6 +2,7 @@
 <!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>
index 99f208b..118c843 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mshtml_winetest" type="win32cui" installbase="bin" installname="mshtml_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="mshtml_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>dom.c</file>
index 72de4eb..45524de 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="msi_winetest" type="win32cui" installbase="bin" installname="msi_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="msi_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>automation.c</file>
index 3b19769..8a4a1e7 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="mstask_winetest" type="win32cui" installbase="bin" installname="mstask_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="mstask_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>task.c</file>
index 0601d98..8f8512a 100644 (file)
@@ -5,6 +5,7 @@
        <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="msvcrt_winetest">.</include>
        <include base="msvcrt">include/reactos/wine/msvcrt</include>
+       <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
        <define name="_CRT_NONSTDC_NO_DEPRECATE" />
        <library>kernel32</library>
index 7bf6e3a..a0c35b0 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="netapi32_winetest" type="win32cui" installbase="bin" installname="netapi32_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="netapi32_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>access.c</file>
index dd9dc57..9be19d0 100644 (file)
@@ -2,7 +2,9 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="ntdll_winetest" type="win32cui" installbase="bin" installname="ntdll_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="ntdll_winetest">.</include>
+    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>kernel32</library>
     <library>ntdll</library>
index 6e57a47..7851118 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="odbccp32_winetest" type="win32cui" installbase="bin" installname="odbccp32_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="odbccp32_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>misc.c</file>
index edd6406..8817952 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="ole32_winetest" type="win32cui" installbase="bin" installname="ole32_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="ole32_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>clipboard.c</file>
index 9100ba8..6d21cec 100644 (file)
@@ -1,8 +1,10 @@
 <module name="powrprof_winetest" type="win32cui" installbase="bin" installname="powrprof_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="powrprof_winetest">.</include>
     <define name="__ROS_LONG64__" />
-    <define name="UNICODE" />
-    <define name="_UNICODE" />
+       <define name="__USE_W32API" />
+       <define name="UNICODE" />
+       <define name="_UNICODE" />
        <library>powrprof</library>
        <library>ntdll</library>
        <library>advapi32</library>
index a9034f7..3e7df36 100644 (file)
@@ -2,8 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="psapi_winetest" type="win32cui" installbase="bin" installname="psapi_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="psapi_winetest">.</include>
     <define name="__ROS_LONG64__" />
+    <define name="__USE_W32API" />
     <library>kernel32</library>
     <library>ntdll</library>
     <library>psapi</library>
index a793ccd..efb5268 100644 (file)
@@ -11,6 +11,7 @@
                <compilerflag compiler="cc">-Wno-format</compilerflag>
                <include base="rpcrt4_winetest">.</include>
                <include root="intermediate" base="rpcrt4_winetest">.</include>
+               <define name="__USE_W32API" />
                <define name="__ROS_LONG64__" />
                <library>wine</library>
                <library>pseh</library>
@@ -29,4 +30,4 @@
                <file>server.c</file>
                <file>testlist.c</file>
        </module>
-</group>
+</group>
\ No newline at end of file
index c4af042..2decf10 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="rsabase_winetest" type="win32cui" installbase="bin" installname="rsabase_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="rsabase_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <library>wine</library>
index 469db29..2142ded 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="rsaenh_winetest" type="win32cui" installbase="bin" installname="rsaenh_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="rsaenh_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>rsaenh.c</file>
index 4eea0f8..82cce22 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="schannel_winetest" type="win32cui" installbase="bin" installname="schannel_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="schannel_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <library>wine</library>
index 2907392..4da0549 100644 (file)
@@ -2,8 +2,9 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="setupapi_winetest" type="win32cui" installbase="bin" installname="setupapi_winetest.exe" allowwarnings="true">
-    <compilerflag compiler="cc">-Wno-format</compilerflag>
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="setupapi_winetest">.</include>
+    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>ntdll</library>
     <library>kernel32</library>
index 6d29d79..c1dd598 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="shell32_winetest" type="win32cui" installbase="bin" installname="shell32_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="shell32_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <library>wine</library>
index f17bcd6..b93c890 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="shlwapi_winetest" type="win32cui" installbase="bin" installname="shlwapi_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="shlwapi_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>assoc.c</file>
index 96ecca7..54635eb 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="urlmon_winetest" type="win32cui" installbase="bin" installname="urlmon_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="urlmon_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>generated.c</file>
index cd56c62..c2d4699 100644 (file)
@@ -2,9 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="user32_winetest" type="win32cui" installbase="bin" installname="user32_winetest.exe" allowwarnings="true">
-    <compilerflag compiler="cc">-Wno-format</compilerflag>
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
     <include base="user32_winetest">.</include>
     <include base="ReactOS">include/reactos/wine</include>
+    <define name="__USE_W32API" />
     <define name="__ROS_LONG64__" />
     <library>ntdll</library>
     <library>user32</library>
index d376e48..8708c2c 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="usp10_winetest" type="win32cui" installbase="bin" installname="usp10_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="usp10_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>usp10.c</file>
index 917aad8..805c38e 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="uxtheme_winetest" type="win32cui" installbase="bin" installname="uxtheme_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="uxtheme_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>system.c</file>
index 7f88072..b6bd119 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="version_winetest" type="win32cui" installbase="bin" installname="version_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="version_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>info.c</file>
index b12b9d3..a089731 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="winhttp_winetest" type="win32cui" installbase="bin" installname="winhttp_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="winhttp_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <file>notification.c</file>
index 32abbc6..2ff720f 100644 (file)
@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="wininet_winetest" type="win32cui" installbase="bin" installname="wininet_winetest.exe" allowwarnings="true">
+       <compilerflag compiler="cc">-Wno-format</compilerflag>
        <include base="wininet_winetest">.</include>
     <define name="__ROS_LONG64__" />
        <library>wine</library>