[ros-diffs] [ekohl] 29059: Use the unicode="yes" attribute in the module element instead of defining UNICODE and _UNICODE.

Author: ekohl
Date: Sat Sep 15 19:12:26 2007
New Revision: 29059

URL: http://svn.reactos.org/svn/reactos?rev=29059&view=rev
Log:
Use the unicode="yes" attribute in the module element instead of defining
UNICODE and _UNICODE.

Modified:
    trunk/reactos/dll/cpl/appwiz/appwiz.rbuild
    trunk/reactos/dll/cpl/desk/desk.rbuild
    trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
    trunk/reactos/dll/cpl/main/main.rbuild
    trunk/reactos/dll/cpl/mmsys/mmsys.rbuild
    trunk/reactos/dll/cpl/ncpa/ncpa.rbuild
    trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild
    trunk/reactos/dll/cpl/powercfg/powercfg.rbuild
    trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild

Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rbui…
==============================================================================
--- trunk/reactos/dll/cpl/appwiz/appwiz.rbuild (original)
+++ trunk/reactos/dll/cpl/appwiz/appwiz.rbuild Sat Sep 15 19:12:26 2007
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="appwiz" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_APPWIZ}"  installbase="system32"
installname="appwiz.cpl">
+<module name="appwiz" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_APPWIZ}"  installbase="system32"
installname="appwiz.cpl" unicode="yes">
 	<importlibrary definition="appwiz.def" />
 	<include base="appwiz">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>

Modified: trunk/reactos/dll/cpl/desk/desk.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r…
==============================================================================
--- trunk/reactos/dll/cpl/desk/desk.rbuild (original)
+++ trunk/reactos/dll/cpl/desk/desk.rbuild Sat Sep 15 19:12:26 2007
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="desk" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_DESK}" installbase="system32"
installname="desk.cpl">
+<module name="desk" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_DESK}" installbase="system32"
installname="desk.cpl" unicode="yes">
 	<importlibrary definition="desk.def" />
 	<include base="desk">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>

Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbui…
==============================================================================
--- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild (original)
+++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rbuild Sat Sep 15 19:12:26 2007
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="hdwwiz" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32"
installname="hdwwiz.cpl">
+<module name="hdwwiz" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_HDWWIZ}" installbase="system32"
installname="hdwwiz.cpl" unicode="yes">
 	<importlibrary definition="hdwwiz.def" />
 	<include base="hdwwiz">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>

Modified: trunk/reactos/dll/cpl/main/main.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rbuild?r…
==============================================================================
--- trunk/reactos/dll/cpl/main/main.rbuild (original)
+++ trunk/reactos/dll/cpl/main/main.rbuild Sat Sep 15 19:12:26 2007
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="main" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_MAIN}" installbase="system32"
installname="main.cpl">
+<module name="main" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_MAIN}" installbase="system32"
installname="main.cpl" unicode="yes">
 	<importlibrary definition="main.def" />
 	<include base="main">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>

Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild…
==============================================================================
--- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original)
+++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Sat Sep 15 19:12:26 2007
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="mmsys" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_MMSYS}" installbase="system32"
installname="mmsys.cpl">
+<module name="mmsys" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_MMSYS}" installbase="system32"
installname="mmsys.cpl" unicode="yes">
 	<importlibrary definition="mmsys.def" />
 	<include base="mmsys">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>

Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rbuild?r…
==============================================================================
--- trunk/reactos/dll/cpl/ncpa/ncpa.rbuild (original)
+++ trunk/reactos/dll/cpl/ncpa/ncpa.rbuild Sat Sep 15 19:12:26 2007
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="ncpa" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_NCPA}" installbase="system32"
installname="ncpa.cpl">
+<module name="ncpa" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_NCPA}" installbase="system32"
installname="ncpa.cpl" unicode="yes">
 	<importlibrary definition="ncpa.def" />
 	<include base="ncpa">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>

Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.…
==============================================================================
--- trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild (original)
+++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild Sat Sep 15 19:12:26 2007
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="odbccp32i" type="win32dll"
extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}"
installbase="system32" installname="odbccp32.cpl" >
+<module name="odbccp32i" type="win32dll"
extension=".cpl" baseaddress="${BASEADDRESS_ODBCCP32}"
installbase="system32" installname="odbccp32.cpl"
unicode="yes">
 	<importlibrary definition="odbccp32.def" />
 	<include base="odbccp32">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>

Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/powercfg.rbuild (original)
+++ trunk/reactos/dll/cpl/powercfg/powercfg.rbuild Sat Sep 15 19:12:26 2007
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="powercfg" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_PWRCFG}" installbase="system32"
installname="powercfg.cpl" allowwarnings="true">
+<module name="powercfg" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_PWRCFG}" installbase="system32"
installname="powercfg.cpl" unicode="yes">
 	<importlibrary definition="powercfg.def" />
 	<include base="powercfg">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>

Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui…
==============================================================================
--- trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild (original)
+++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Sat Sep 15 19:12:26 2007
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="usrmgr" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_USRMGR}" installbase="system32"
installname="usrmgr.cpl">
+<module name="usrmgr" type="win32dll" extension=".cpl"
baseaddress="${BASEADDRESS_USRMGR}" installbase="system32"
installname="usrmgr.cpl" unicode="yes">
 	<importlibrary definition="usrmgr.def" />
 	<include base="usrmgr">.</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<define name="__REACTOS__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>