Fix some .rbuild file problems
authorHervé Poussineau <hpoussin@reactos.org>
Thu, 8 May 2008 16:01:30 +0000 (16:01 +0000)
committerHervé Poussineau <hpoussin@reactos.org>
Thu, 8 May 2008 16:01:30 +0000 (16:01 +0000)
See issue #2710 for more details.

svn path=/trunk/; revision=33366

88 files changed:
reactos/ReactOS-generic.rbuild
reactos/base/applications/calc/calc.rbuild
reactos/base/applications/cmdutils/doskey/doskey.rbuild
reactos/base/applications/dxdiag/dxdiag.rbuild
reactos/base/applications/msconfig/msconfig.rbuild
reactos/base/applications/network/route/route.rbuild
reactos/base/applications/regedit/clb/clb.rbuild
reactos/base/applications/regedit/regedit.rbuild
reactos/base/applications/sc/sc.rbuild
reactos/base/applications/screensavers/logon/logon.rbuild
reactos/base/applications/sndvol32/sndvol32.rbuild
reactos/base/services/eventlog/eventlog.rbuild
reactos/base/services/umpnpmgr/umpnpmgr.rbuild
reactos/base/setup/setup/setup.rbuild
reactos/base/setup/vmwinst/vmwinst.rbuild
reactos/base/setup/welcome/welcome.rbuild
reactos/base/shell/cmd/cmd.rbuild
reactos/base/shell/explorer/explorer.rbuild
reactos/base/system/lsass/lsass.rbuild
reactos/base/system/regsvr32/regsvr32.rbuild
reactos/base/system/rundll32/rundll32.rbuild
reactos/base/system/services/services.rbuild
reactos/boot/freeldr/fdebug/fdebug.rbuild
reactos/dll/cpl/console/console.rbuild
reactos/dll/cpl/input/input.rbuild
reactos/dll/directx/ddraw/ddraw.rbuild
reactos/dll/directx/devenum/devenum.rbuild
reactos/dll/directx/dinput/dinput.rbuild
reactos/dll/directx/dinput8/dinput8.rbuild
reactos/dll/directx/directx.rbuild
reactos/dll/directx/dplay/dplay.rbuild
reactos/dll/directx/dplayx/dplayx.rbuild
reactos/dll/directx/dxdiagn/dxdiagn.rbuild
reactos/dll/directx/wine/d3d8/d3d8.rbuild
reactos/dll/directx/wine/d3d9/d3d9.rbuild
reactos/dll/shellext/devcpux/devcpux.rbuild
reactos/dll/shellext/shellext.rbuild
reactos/dll/shellext/slayer/slayer.rbuild
reactos/dll/win32/acledit/acledit.rbuild
reactos/dll/win32/aclui/aclui.rbuild
reactos/dll/win32/advapi32/advapi32.rbuild
reactos/dll/win32/authz/authz.rbuild
reactos/dll/win32/beepmidi/beepmidi.rbuild
reactos/dll/win32/browseui/browseui.rbuild
reactos/dll/win32/cards/cards.rbuild
reactos/dll/win32/compstui/compstui.rbuild
reactos/dll/win32/crypt32/crypt32.rbuild
reactos/dll/win32/devmgr/devmgr.rbuild
reactos/dll/win32/gdi32/gdi32.rbuild
reactos/dll/win32/gdiplus/gdiplus.rbuild
reactos/dll/win32/hid/hid.rbuild
reactos/dll/win32/inetcomm/inetcomm.rbuild
reactos/dll/win32/iphlpapi/iphlpapi.rbuild
reactos/dll/win32/lsasrv/lsasrv.rbuild
reactos/dll/win32/mmdrv/mmdrv.rbuild
reactos/dll/win32/msacm32/msacm32.rbuild
reactos/dll/win32/msafd/msafd.rbuild
reactos/dll/win32/mswsock/mswsock.rbuild
reactos/dll/win32/msxml3/msxml3.rbuild
reactos/dll/win32/nddeapi/nddeapi.rbuild
reactos/dll/win32/ntdsapi/ntdsapi.rbuild
reactos/dll/win32/ntmarta/ntmarta.rbuild
reactos/dll/win32/opengl32/opengl32.rbuild
reactos/dll/win32/pdh/pdh.rbuild
reactos/dll/win32/printui/printui.rbuild
reactos/dll/win32/rpcrt4/rpcrt4.rbuild
reactos/dll/win32/samsrv/samsrv.rbuild
reactos/dll/win32/serialui/serialui.rbuild
reactos/dll/win32/setupapi/setupapi.rbuild
reactos/dll/win32/shdocvw/shdocvw.rbuild
reactos/dll/win32/snmpapi/snmpapi.rbuild
reactos/dll/win32/tapi32/tapi32.rbuild
reactos/dll/win32/user32/user32.rbuild
reactos/dll/win32/vdmdbg/vdmdbg.rbuild
reactos/dll/win32/winfax/winfax.rbuild
reactos/dll/win32/winmm/midimap/midimap.rbuild
reactos/dll/win32/winmm/wavemap/wavemap.rbuild
reactos/dll/win32/winmm/winmm.rbuild
reactos/dll/win32/winspool/winspool.rbuild
reactos/dll/win32/wintrust/wintrust.rbuild
reactos/dll/win32/ws2_32/ws2_32.rbuild
reactos/dll/win32/ws2help/ws2help.rbuild
reactos/dll/win32/wshirda/wshirda.rbuild
reactos/dll/win32/wsock32/wsock32.rbuild
reactos/drivers/network/wshtcpip/wshtcpip.rbuild
reactos/lib/3rdparty/mingw/mingw.rbuild
reactos/lib/drivers/chew/chew.rbuild
reactos/subsystems/win32/win32k/win32k.rbuild

index f3ba08b..93120b6 100644 (file)
@@ -3,7 +3,7 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <xi:include href="baseaddress.rbuild" />
 
-       <define name="__REACTOS__" overridable="true" />
+       <define name="__REACTOS__" />
        <if property="DBG" value="1">
                <define name="DBG">1</define>
                <define name="_SEH_ENABLE_TRACE" />
index 82dc8ca..31b4dd3 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="true">
+<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="yes">
        <include base="calc">.</include>
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x0501</define>
index e645cfd..cfa67ca 100644 (file)
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe">
+<module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe" unicode="yes">
        <define name="_WIN32_IE">0x0501</define>
        <define name="_WIN32_WINNT">0x0501</define>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>kernel32</library>
        <file>doskey.c</file>
        <file>doskey.rc</file>
index 3a1695e..3d91fe4 100644 (file)
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe">
+<module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe" unicode="yes">
        <include base="dxdiag">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x600</define>
        <library>kernel32</library>
index 33c972d..7358fef 100644 (file)
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe">
+<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe" unicode="yes">
        <include base="msconfig">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <library>kernel32</library>
index cfc58a3..fbfc1ee 100644 (file)
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="route" type="win32cui" installbase="system32" installname="route.exe">
+<module name="route" type="win32cui" installbase="system32" installname="route.exe" unicode="yes">
        <include base="route">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>kernel32</library>
        <library>ws2_32</library>
        <library>iphlpapi</library>
index f3215c3..b3a0cf5 100644 (file)
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll">
+<module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll" unicode="yes">
        <importlibrary definition="clb.def" />
        <include base="clb">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
        <define name="WINVER">0x0600</define>
index fdd1bd7..da34681 100644 (file)
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<module name="regedit" type="win32gui" installname="regedit.exe">
+<module name="regedit" type="win32gui" installname="regedit.exe" unicode="yes">
        <include base="regedit">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x0501</define>
        <define name="_WIN32_WINNT">0x0600</define>
        <library>uuid</library>
index f928ccc..ea0924c 100644 (file)
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="sc" type="win32cui" installbase="system32" installname="sc.exe">
+<module name="sc" type="win32cui" installbase="system32" installname="sc.exe" unicode="yes">
        <define name="DEFINE_GUID" />
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>kernel32</library>
        <library>advapi32</library>
        <file>control.c</file>
index 3fe58b7..32085fb 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="true">
+<module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="yes">
        <importlibrary definition="logon.spec.def" />
        <include base="logon">.</include>
        <library>scrnsave</library>
index cd1460c..5c53acb 100644 (file)
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="sndvol32" type="win32gui" installbase="system32" installname="sndvol32.exe">
+<module name="sndvol32" type="win32gui" installbase="system32" installname="sndvol32.exe" unicode="yes">
        <include base="ReactOS">include/wine</include>
        <include base="sndvol32">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
        <define name="WINVER">0x0600</define>
index 9a08bd8..ab81f2f 100644 (file)
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="eventlog" type="win32cui" installbase="system32" installname="eventlog.exe">
+<module name="eventlog" type="win32cui" installbase="system32" installname="eventlog.exe" unicode="yes">
        <include base="eventlog">.</include>
        <include base="eventlog_server">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>ntdll</library>
        <library>kernel32</library>
        <library>advapi32</library>
index 49279a5..4c4d681 100644 (file)
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="umpnpmgr" type="win32cui" installbase="system32" installname="umpnpmgr.exe">
+<module name="umpnpmgr" type="win32cui" installbase="system32" installname="umpnpmgr.exe" unicode="yes">
        <include base="umpnpmgr">.</include>
        <include base="pnp_server">.</include>
        <define name="WINVER">0x600</define>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>pnp_server</library>
        <library>ntdll</library>
        <library>kernel32</library>
index aaa8248..01d946f 100644 (file)
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="setup" type="win32gui" installbase="system32" installname="setup.exe">
+<module name="setup" type="win32gui" installbase="system32" installname="setup.exe" unicode="yes">
        <include base="setup">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x0400</define>
        <library>kernel32</library>
        <library>userenv</library>
index 6f26063..cd8fa4b 100644 (file)
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="vmwinst" type="win32gui" installbase="system32" installname="vmwinst.exe">
+<module name="vmwinst" type="win32gui" installbase="system32" installname="vmwinst.exe" unicode="yes">
        <include base="vmwinst">.</include>
-       <define name="UNICODE" />
        <define name="_WIN32_IE">0x0501</define>
        <define name="_WIN32_WINNT">0x0501</define>
        <library>kernel32</library>
index c8aff15..5369168 100644 (file)
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe">
+<module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe" unicode="yes">
        <bootstrap installbase="$(CDOUTPUT)" />
        <include base="welcome">.</include>
        <define name="_WIN32_IE">0x0501</define>
        <define name="_WIN32_WINNT">0x0501</define>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>kernel32</library>
        <library>gdi32</library>
        <library>user32</library>
index 4b56be9..29a61f2 100644 (file)
@@ -1,14 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-       <module name="cmd_base" type="objectlibrary">
+       <module name="cmd_base" type="objectlibrary" unicode="yes">
                <include base="ReactOS">include/reactos/wine</include>
                <include base="cmd_base">.</include>
                <define name="ANONYMOUSUNIONS" />
                <define name="_WIN32_WINNT">0x0501</define>
                <define name="_DEBUG_MEM" />
-               <define name="UNICODE" />
-               <define name="_UNICODE" />
                <pch>precomp.h</pch>
                <compilationunit name="unit.c">
                        <file>alias.c</file>
index 85b3258..5111671 100644 (file)
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true">
+<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" unicode="yes">
        <linkerflag>-fexceptions</linkerflag>
        <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
        <include base="explorer">.</include>
-       <define name="UNICODE" />
        <define name="WIN32" />
        <define name="_ROS_" />
        <define name="_WIN32_IE">0x0600</define>
index 022361d..e13373a 100644 (file)
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="lsass" type="win32gui" installbase="system32" installname="lsass.exe">
+<module name="lsass" type="win32gui" installbase="system32" installname="lsass.exe" unicode="yes">
        <include base="lsass">.</include>
        <include base="ReactOS">include/reactos/subsys</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>advapi32</library>
        <library>ntdll</library>
        <library>kernel32</library>
index 1eac949..db73790 100644 (file)
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="regsvr32" type="win32gui" installbase="system32" installname="regsvr32.exe">
+<module name="regsvr32" type="win32gui" installbase="system32" installname="regsvr32.exe" unicode="yes">
        <include base="regsvr32">.</include>
-       <define name="UNICODE" />
        <library>kernel32</library>
        <library>user32</library>
        <library>shell32</library>
index e159a8a..b5bc53e 100644 (file)
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.exe">
+<module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.exe" unicode="yes">
        <include base="rundll32">.</include>
-       <define name="UNICODE" />
        <library>kernel32</library>
        <library>user32</library>
        <file>rundll32.c</file>
index a5bd8ac..7947190 100644 (file)
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="services" type="win32cui" installbase="system32" installname="services.exe">
+<module name="services" type="win32cui" installbase="system32" installname="services.exe" unicode="yes">
        <include base="services">.</include>
        <include base="scm_server">.</include>
        <include base="ReactOS">include/reactos/subsys</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>scm_server</library>
        <library>ntdll</library>
        <library>kernel32</library>
index e611be2..0321c4c 100644 (file)
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe">
+<module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe" unicode="yes">
        <include base="freeldr_fdebug">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <library>kernel32</library>
index 7d8d759..a905d98 100644 (file)
@@ -1,8 +1,6 @@
-<module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll">
+<module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll" unicode="yes">
        <importlibrary definition="console.def" />
        <include base="console">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <library>kernel32</library>
index 0e50f32..ef02249 100644 (file)
@@ -10,7 +10,7 @@
        <library>user32</library>
        <library>comctl32</library>
        <library>msvcrt</library>
-    <library>gdi32</library>
+       <library>gdi32</library>
        <file>input.c</file>
        <file>settings.c</file>
        <file>keysettings.c</file>
index 0e674d0..d91a0f0 100644 (file)
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true">
+<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes">
        <importlibrary definition="ddraw.def" />
        <include base="ddraw">.</include>
-       <define name="UNICODE" />
        <define name="WINVER">0x0600</define>
        <define name="_WIN32_WINNT">0x0501</define>
 
index 7096c13..316c3f5 100644 (file)
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true">
+<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true" unicode="yes">
        <!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
        <importlibrary definition="devenum.spec.def" />
        <include base="devenum">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index ab85a5f..9ec004c 100644 (file)
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings ="true">
+<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings ="true" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
        <importlibrary definition="dinput.spec.def" />
        <include base="dinput">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index ac6d59d..539b927 100644 (file)
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dinput8" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll">
+<module name="dinput8" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
        <importlibrary definition="dinput8.spec.def" />
        <include base="dinput8">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index 9bfc041..4cee3b3 100644 (file)
@@ -4,12 +4,12 @@
        <directory name="d3d8thk">
                <xi:include href="d3d8thk/d3d8thk.rbuild" />
        </directory>
-       <directory name="devenum">
-               <xi:include href="devenum/devenum.rbuild" />
-       </directory>
        <directory name="ddraw">
                <xi:include href="ddraw/ddraw.rbuild" />
        </directory>
+       <directory name="devenum">
+               <xi:include href="devenum/devenum.rbuild" />
+       </directory>
        <directory name="dinput">
                <xi:include href="dinput/dinput.rbuild" />
        </directory>
index 169567f..81144ba 100644 (file)
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dplay" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll">
+<module name="dplay" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll" unicode="yes">
        <importlibrary definition="dplay.spec.def" />
        <include base="dinput8">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index d77633b..fb4bde9 100644 (file)
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true">
+<module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true" unicode="yes">
        <!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
        <importlibrary definition="dplayx.spec.def" />
        <include base="dplayx">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index 52c14a6..df69d27 100644 (file)
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true">
+<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true" unicode="yes">
        <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
        <importlibrary definition="dxdiagn.spec.def" />
        <include base="dxdiagn">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index 653fce1..65c8232 100644 (file)
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings ="true">  
+<module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings ="true" unicode="yes">
        <importlibrary definition="d3d8.spec.def" />
        <include base="d3d8">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index 60325e3..e6a43e3 100644 (file)
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings ="true">  
+<module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings ="true" unicode="yes">
        <importlibrary definition="d3d9.spec.def" />
        <include base="d3d9">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index c4a5ea4..83ff1c1 100644 (file)
@@ -1,9 +1,7 @@
-<module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll">
+<module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll" unicode="yes">
        <importlibrary definition="devcpux.def" />
        <include base="devcpux">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index a8ec380..ccdab8f 100644 (file)
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-       <directory name="slayer">
-               <xi:include href="slayer/slayer.rbuild" />
-       </directory>
        <directory name="deskadp">
                <xi:include href="deskadp/deskadp.rbuild" />
        </directory>
@@ -13,4 +10,7 @@
        <directory name="devcpux">
                <xi:include href="devcpux/devcpux.rbuild" />
        </directory>
+       <directory name="slayer">
+               <xi:include href="slayer/slayer.rbuild" />
+       </directory>
 </group>
index 7b99bc3..2bc627e 100644 (file)
@@ -1,8 +1,6 @@
-<module name="slayer" type="win32dll" baseaddress="${BASEADDRESS_SLAYER}" installbase="system32" installname="slayer.dll">
+<module name="slayer" type="win32dll" baseaddress="${BASEADDRESS_SLAYER}" installbase="system32" installname="slayer.dll" unicode="yes">
        <importlibrary definition="slayer.def" />
        <include base="slayer">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x601</define>
        <library>kernel32</library>
index a288303..e71a8ee 100644 (file)
@@ -1,8 +1,6 @@
-<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}" installbase="system32" installname="acledit.dll">
+<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}" installbase="system32" installname="acledit.dll" unicode="yes">
        <importlibrary definition="acledit.def" />
        <include base="acledit">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
 
        <metadata description = "Access Control List Editor" />
 
index f465b24..5dd969b 100644 (file)
@@ -1,8 +1,6 @@
-<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll">
+<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll" unicode="yes">
        <importlibrary definition="aclui.spec.def" />
        <include base="aclui">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
        <define name="WINVER">0x0600</define>
index 8ca94fe..32a8615 100644 (file)
@@ -1,4 +1,4 @@
-<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll">
+<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll" unicode="yes">
 
        <importlibrary definition="advapi32.def" />
        <include base="advapi32">.</include>
@@ -8,8 +8,6 @@
        <define name="WINVER">0x600</define>
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
-       <define name="UNICODE"></define>
-       <define name="_UNICODE"></define>
        <library>scm_client</library>
        <library>lsa_client</library>
        <library>eventlog_client</library>
index 7dfa3fc..454c949 100644 (file)
@@ -1,8 +1,6 @@
-<module name="authz" type="win32dll" baseaddress="${BASEADDRESS_AUTHZ}" installbase="system32" installname="authz.dll">
+<module name="authz" type="win32dll" baseaddress="${BASEADDRESS_AUTHZ}" installbase="system32" installname="authz.dll" unicode="yes">
        <importlibrary definition="authz.def" />
        <include base="authz">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
        <define name="WINVER">0x0600</define>
index a53b694..156d95c 100644 (file)
@@ -1,8 +1,6 @@
-<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll">
+<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll" unicode="yes">
        <importlibrary definition="beepmidi.def" />
        <include base="beepmidi">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>ntdll</library>
        <library>kernel32</library>
        <library>user32</library>
index 63df635..671f9cc 100644 (file)
@@ -6,7 +6,6 @@
        <include base="browseui">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <include base="explorer_new">.</include>
-       <define name="__REACTOS__" />
        <define name="__WINESRC__" />
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x600</define>
index 94a8bdc..cab5fdb 100644 (file)
@@ -1,8 +1,6 @@
-<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cards.dll">
+<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cards.dll" unicode="yes">
        <importlibrary definition="cards.def" />
        <include base="cards">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
 
        <!-- Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN -->
        <define name="CARDSTYLE_DEFAULT" />
index d7562f2..3805c86 100644 (file)
@@ -2,7 +2,6 @@
         <importlibrary definition="compstui.spec.def" />
         <include base="compstui">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
index d8bbbad..c641672 100644 (file)
@@ -2,7 +2,6 @@
        <importlibrary definition="crypt32.spec.def" />
        <include base="crypt32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="__REACTOS__" />
        <define name="__WINESRC__" />
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x600</define>
index cf29ec2..226979a 100644 (file)
@@ -1,8 +1,6 @@
-<module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" allowwarnings="true">
+<module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" allowwarnings="true" unicode="yes">
        <include base="devmgr">.</include>
        <importlibrary definition="devmgr.spec.def" />
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index 590fb08..fe27eb3 100644 (file)
@@ -1,8 +1,7 @@
-<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll">
+<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes">
        <importlibrary definition="gdi32.def" />
        <include base="gdi32">include</include>
        <define name="_DISABLE_TIDENTS" />
-       <define name="UNICODE" />
        <define name="WINVER">0x0600</define>
        <define name="_WIN32_WINNT">0x0501</define>
        <define name="LANGPACK" />
index dd0b0ca..07a5edb 100644 (file)
@@ -2,7 +2,6 @@
         <importlibrary definition="gdiplus.spec.def" />
         <include base="gdiplus">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
index b16c6c2..b37a2d9 100644 (file)
@@ -1,8 +1,6 @@
-<module name="hid" type="win32dll" baseaddress="${BASEADDRESS_HID}" installbase="system32" installname="hid.dll">
+<module name="hid" type="win32dll" baseaddress="${BASEADDRESS_HID}" installbase="system32" installname="hid.dll" unicode="yes">
        <importlibrary definition="hid.def" />
        <include base="hid">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x0600</define>
        <define name="WINVER">0x0600</define>
index e40100f..a01db12 100644 (file)
@@ -2,7 +2,6 @@
         <importlibrary definition="inetcomm.spec.def" />
         <include base="inetcomm">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
index 9af6794..b93ab59 100644 (file)
@@ -1,9 +1,7 @@
-<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true">
+<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true" unicode="yes">
        <importlibrary definition="iphlpapi.spec.def" />
        <include base="iphlpapi">include</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>wine</library>
        <library>ntdll</library>
        <library>kernel32</library>
index 9f3db5f..fc09c4f 100644 (file)
@@ -1,9 +1,7 @@
-<module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll">
+<module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll" unicode="yes">
        <importlibrary definition="lsasrv.def" />
        <include base="lsasrv">.</include>
        <include base="lsa_server">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="WINVER">0x600</define>
        <define name="_WIN32_WINNT">0x0600</define>
        <linkerflag>-nostartfiles</linkerflag>
index 88ef90d..4cf783b 100644 (file)
@@ -1,8 +1,6 @@
-<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll">
+<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes">
        <importlibrary definition="mmdrv.def" />
        <include base="mmdrv">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="NDEBUG" />
        <library>ntdll</library>
        <library>kernel32</library>
index 5dae9ac..9d83ecf 100644 (file)
@@ -1,10 +1,7 @@
-<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll">
+<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes">
        <importlibrary definition="msacm32.spec.def" />
        <include base="msacm32">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
-       <define name="__REACTOS__" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index cbc4c59..6e8b186 100644 (file)
@@ -1,10 +1,8 @@
-<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll">
+<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll" unicode="yes">
        <importlibrary definition="msafd.def" />
        <include base="msafd">.</include>
        <include base="msafd">include</include>
        <include base="ReactOS">include/reactos/drivers</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <pch>msafd.h</pch>
        <library>ntdll</library>
        <library>kernel32</library>
index b0a18c5..36e576b 100644 (file)
@@ -1,6 +1,5 @@
-<module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll">
+<module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll" unicode="yes">
        <importlibrary definition="mswsock.def" />
-       <define name="UNICODE" />
        <define name="LE" />
        <library>kernel32</library>
        <library>ws2_32</library>
index 7bae3c8..bad16c8 100644 (file)
@@ -3,7 +3,6 @@
        <importlibrary definition="msxml3.spec.def" />
        <include base="msxml3">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="__REACTOS__" />
        <define name="__WINESRC__" />
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x600</define>
index 3fce933..8700ed6 100644 (file)
@@ -2,7 +2,6 @@
         <importlibrary definition="nddeapi.spec.def" />
         <include base="nddeapi">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
index baad504..ea1a3ac 100644 (file)
@@ -2,7 +2,6 @@
         <importlibrary definition="ntdsapi.spec.def" />
         <include base="ntdsapi">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
index ac3b0ac..b1a2e7d 100644 (file)
@@ -1,8 +1,6 @@
-<module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll">
+<module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll" unicode="yes">
        <importlibrary definition="ntmarta.def" />
        <include base="ntmarta">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x0500</define>
        <define name="_WIN32_WINNT">0x600</define>
        <define name="WINVER">0x0600</define>
index 02e3b75..bdd58c6 100644 (file)
@@ -1,7 +1,5 @@
-<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll">
+<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes">
        <importlibrary definition="opengl32.def" />
-       <include base="wsock32">.</include>
-       <define name="UNICODE" />
        <define name="_DISABLE_TIDENTS" />
        <library>ntdll</library>
        <library>kernel32</library>
index 5b93ae1..1a3e081 100644 (file)
@@ -2,7 +2,6 @@
         <importlibrary definition="pdh.spec.def" />
         <include base="pdh">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
index 9ed6ce2..de3560d 100644 (file)
@@ -2,7 +2,6 @@
         <importlibrary definition="printui.spec.def" />
         <include base="printui">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
index 792f471..66a771e 100644 (file)
@@ -3,7 +3,6 @@
        <importlibrary definition="rpcrt4.spec.def" />
        <include base="rpcrt4">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="__REACTOS__" />
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
index 009c321..342a0db 100644 (file)
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll">
+<module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll" unicode="yes">
        <importlibrary definition="samsrv.def" />
        <include base="samsrv">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <linkerflag>-nostartfiles</linkerflag>
        <linkerflag>-nostdlib</linkerflag>
        <library>ntdll</library>
index ac7ee59..9099b0a 100644 (file)
@@ -1,8 +1,6 @@
-<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll">
+<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll" unicode="yes">
        <importlibrary definition="serialui.def" />
        <include base="serialui">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>kernel32</library>
        <library>user32</library>
        <library>shlwapi</library>
index a606813..0a0301a 100644 (file)
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true">
+<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true" unicode="yes">
        <importlibrary definition="setupapi.spec.def" />
        <include base="setupapi">.</include>
        <include base="ReactOS">include/reactos/wine</include>
        <include base="pnp_client">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index e86de9e..0e8a337 100644 (file)
@@ -3,7 +3,6 @@
        <importlibrary definition="shdocvw.spec.def" />
        <include base="shdocvw">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="__REACTOS__" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index 41a8f7a..93e2a1b 100644 (file)
@@ -1,7 +1,6 @@
-<module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll">
+<module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll" unicode="yes">
        <importlibrary definition="snmpapi.def" />
        <include base="snmpapi">.</include>
-       <define name="UNICODE" />
        <define name="_DISABLE_TIDENTS" />
        <library>ntdll</library>
        <library>kernel32</library>
index c313017..e6be1a5 100644 (file)
@@ -2,7 +2,6 @@
         <importlibrary definition="tapi32.spec.def" />
         <include base="tapi32">.</include>
         <include base="ReactOS">include/reactos/wine</include>
-        <define name="__REACTOS__" />
         <define name="__WINESRC__" />
         <define name="__USE_W32API" />
         <define name="TAPI_CURRENT_VERSION">0x00020000</define>
index c77d3a0..0ef21ab 100644 (file)
@@ -1,10 +1,9 @@
-<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" allowwarnings="true">
+<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" allowwarnings="true" unicode="yes">
        <importlibrary definition="user32.def" />
        <include base="user32">.</include>
        <include base="user32">include</include>
        <include base="ReactOS">include/reactos/subsys</include>
        <define name="_DISABLE_TIDENTS" />
-       <define name="UNICODE" />
        <define name="WINVER">0x0600</define>
        <define name="_WIN32_WINNT">0x0501</define>
        <library>wine</library>
index 6c094e9..7edd52d 100644 (file)
@@ -1,8 +1,6 @@
-<module name="vdmdbg" type="win32dll" baseaddress="${BASEADDRESS_VDMDBG}" installbase="system32" installname="vdmdbg.dll">
+<module name="vdmdbg" type="win32dll" baseaddress="${BASEADDRESS_VDMDBG}" installbase="system32" installname="vdmdbg.dll" unicode="yes">
        <importlibrary definition="vdmdbg.def" />
        <include base="vdmdbg">.</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
        <library>ntdll</library>
        <library>kernel32</library>
        <file>vdmdbg.c</file>
index 3e42903..1ff4dcd 100644 (file)
@@ -1,7 +1,6 @@
 <module name="winfax" type="win32dll" baseaddress="${BASEADDRESS_WINFAX}" installbase="system32" installname="winfax.dll" allowwarnings="true" entrypoint="0">
         <importlibrary definition="winfax.def" />
         <include base="winfax">.</include>
-        <define name="__REACTOS__" />
         <define name="__USE_W32API" />
         <define name="_WIN32_IE">0x600</define>
         <define name="_WIN32_WINNT">0x501</define>
index 81b6cdd..9014796 100644 (file)
@@ -1,10 +1,7 @@
-<module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true">
+<module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true" unicode="yes">
        <importlibrary definition="midimap.spec.def" />
        <include base="midimap">.</include>
        <include base="ReactOS">include/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
-       <define name="__REACTOS__" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index ce75ad3..c493f03 100644 (file)
@@ -1,10 +1,7 @@
-<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true">
+<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true" unicode="yes">
        <importlibrary definition="msacm.spec.def" />
        <include base="wavemap">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
-       <define name="__REACTOS__" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index e4cc4b9..5920588 100644 (file)
@@ -11,7 +11,6 @@
        <importlibrary definition="winmm.spec.def" />
        <include base="winmm">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="__REACTOS__" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
        <define name="WINVER">0x501</define>
index 59cade3..107f26b 100644 (file)
@@ -1,10 +1,7 @@
-<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv" allowwarnings="true">
+<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv" allowwarnings="true" unicode="yes">
        <importlibrary definition="winspool.def" />
        <include base="winspool">.</include>
        <define name="_DISABLE_TIDENTS" />
-       <define name="UNICODE" />
-       <define name="_UNICODE" />
-       <define name="__REACTOS__" />
        <library>ntdll</library>
        <library>kernel32</library>
        <file>info.c</file>
index 13239b2..b0bcdf8 100644 (file)
@@ -3,7 +3,6 @@
        <importlibrary definition="wintrust.spec.def" />
        <include base="wintrust">.</include>
        <include base="ReactOS">include/reactos/wine</include>
-       <define name="__REACTOS__" />
        <define name="__WINESRC__" />
        <define name="_WIN32_IE">0x600</define>
        <define name="_WIN32_WINNT">0x501</define>
index c35e0a9..1fa4a54 100644 (file)
@@ -1,9 +1,8 @@
-<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll">
+<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll" unicode="yes">
        <importlibrary definition="ws2_32.def" />
        <include base="ws2_32">include</include>
        <include base="ReactOS">include/reactos/wine</include>
        <define name="_DISABLE_TIDENTS" />
-       <define name="UNICODE" />
        <define name="LE" />
        <define name="_WIN32_WINNT">0x0500</define>
        <library>wine</library>
index 7c5d2e9..6f3a0a6 100644 (file)
@@ -1,7 +1,6 @@
-<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll">
+<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll" unicode="yes">
        <importlibrary definition="ws2help.def" />
        <include base="ws2help">.</include>
-       <define name="UNICODE" />
        <define name="_DISABLE_TIDENTS" />
        <library>ntdll</library>
        <library>kernel32</library>
index f4c7408..5704b4b 100644 (file)
@@ -1,7 +1,6 @@
-<module name="wshirda" type="win32dll" baseaddress="${BASEADDRESS_WSHIRDA}" installbase="system32" installname="wshirda.dll">
+<module name="wshirda" type="win32dll" baseaddress="${BASEADDRESS_WSHIRDA}" installbase="system32" installname="wshirda.dll" unicode="yes">
        <importlibrary definition="wshirda.def" />
        <include base="wshirda">.</include>
-       <define name="UNICODE" />
        <define name="_DISABLE_TIDENTS" />
        <library>ntdll</library>
        <library>kernel32</library>
index 0c4470d..757702b 100644 (file)
@@ -1,7 +1,6 @@
-<module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}" installbase="system32" installname="wsock32.dll">
+<module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}" installbase="system32" installname="wsock32.dll" unicode="yes">
        <importlibrary definition="wsock32.def" />
        <include base="wsock32">.</include>
-       <define name="UNICODE" />
        <library>ntdll</library>
        <library>kernel32</library>
        <library>ws2_32</library>
index 2e16448..0fd9a7d 100644 (file)
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="wshtcpip" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll">
+<module name="wshtcpip" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll" unicode="yes">
        <importlibrary definition="wshtcpip.def"></importlibrary>
        <include base="wshtcpip">.</include>
-       <define name="UNICODE" />
        <library>ntdll</library>
        <library>kernel32</library>
        <library>ws2_32</library>
index 3f6e2c7..c1dbef7 100644 (file)
@@ -3,7 +3,6 @@
 <group>
 <module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true">
        <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" />
-       <include base="ReactOS">include/crt</include>
        <include base="mingw_common">include</include>
        <file>cpu_features.c</file>
        <file>CRTfmode.c</file>
        </if>
 </module>
 <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true">
-       <include base="ReactOS">include/crt</include>
        <include base="mingw_common">include</include>
        <file>binmode.c</file>
        <file>crt1.c</file>
        <file>main.c</file>
 </module>
 <module name="mingw_wmain" type="staticlibrary" isstartuplib="true" allowwarnings="true">
-       <include base="ReactOS">include/crt</include>
        <include base="mingw_common">include</include>
        <file>wbinmode.c</file>
        <file>wcrt1.c</file>
        <file>wmain.c</file>
 </module>
 <module name="mingw_dllmain" type="staticlibrary" isstartuplib="true">
-       <include base="ReactOS">include/crt</include>
        <include base="mingw_common">include</include>
        <file>dllcrt1.c</file>
 </module>
index 50ca926..3c1f355 100644 (file)
@@ -3,6 +3,5 @@
 <module name="chew" type="staticlibrary">
        <define name="_NTOSKRNL_" />
        <include base="chew">include</include>
-       <include base="ReactOS">include/ddk</include>
        <file>workqueue.c</file>
 </module>
\ No newline at end of file
index b4b5c65..89c43ac 100644 (file)
@@ -9,7 +9,6 @@
        <include base="freetype">include</include>
        <include base="ReactOS">include/reactos/subsys</include>
        <include base="ReactOS">include/reactos/drivers</include>
-       <define name="UNICODE" />
        <define name="_WIN32_WINNT">0x0501</define>
        <define name="WINVER">0x600</define>
        <define name="LANGPACK" />