[navaraf] 17012: Merge 16725 from trunk:

Merge 16725 from trunk:
Build Wine DLLs without the UNICODE and _UNICODE definitions. (Note: The
Wine DLLs use A/W functions explicitely, so this doesn't have any
performance impact.)
Modified: branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml
Modified: branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml
--- branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,49 +1,47 @@

-<module name="comctl32" type="win32dll"
baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32"
installname="comctl32.dll" warnings="true">
-	<importlibrary definition="comctl32.spec.def" />
-	<include base="comctl32">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<library>wine</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>gdi32</library>
-	<library>user32</library>
-	<library>winmm</library>
-	<file>animate.c</file>
-	<file>comboex.c</file>
-	<file>comctl32undoc.c</file>
-	<file>commctrl.c</file>
-	<file>datetime.c</file>
-	<file>draglist.c</file>
-	<file>flatsb.c</file>
-	<file>header.c</file>
-	<file>hotkey.c</file>
-	<file>imagelist.c</file>
-	<file>ipaddress.c</file>
-	<file>listview.c</file>
-	<file>monthcal.c</file>
-	<file>nativefont.c</file>
-	<file>pager.c</file>
-	<file>progress.c</file>
-	<file>propsheet.c</file>
-	<file>rebar.c</file>
-	<file>smoothscroll.c</file>
-	<file>string.c</file>
-	<file>status.c</file>
-	<file>syslink.c</file>
-	<file>tab.c</file>
-	<file>toolbar.c</file>
-	<file>tooltips.c</file>
-	<file>trackbar.c</file>
-	<file>treeview.c</file>
-	<file>updown.c</file>
-	<file>rsrc.rc</file>
-	<file>comctl32.spec</file>
-</module>
+<module name="comctl32" type="win32dll"
baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32"
installname="comctl32.dll" warnings="true">
+	<importlibrary definition="comctl32.spec.def" />
+	<include base="comctl32">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>gdi32</library>
+	<library>user32</library>
+	<library>winmm</library>
+	<file>animate.c</file>
+	<file>comboex.c</file>
+	<file>comctl32undoc.c</file>
+	<file>commctrl.c</file>
+	<file>datetime.c</file>
+	<file>draglist.c</file>
+	<file>flatsb.c</file>
+	<file>header.c</file>
+	<file>hotkey.c</file>
+	<file>imagelist.c</file>
+	<file>ipaddress.c</file>
+	<file>listview.c</file>
+	<file>monthcal.c</file>
+	<file>nativefont.c</file>
+	<file>pager.c</file>
+	<file>progress.c</file>
+	<file>propsheet.c</file>
+	<file>rebar.c</file>
+	<file>smoothscroll.c</file>
+	<file>string.c</file>
+	<file>status.c</file>
+	<file>syslink.c</file>
+	<file>tab.c</file>
+	<file>toolbar.c</file>
+	<file>tooltips.c</file>
+	<file>trackbar.c</file>
+	<file>treeview.c</file>
+	<file>updown.c</file>
+	<file>rsrc.rc</file>
+	<file>comctl32.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml
--- branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,34 +1,32 @@

-<module name="comdlg32" type="win32dll"
baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32"
installname="comdlg32.dll" warnings="true" usewrc="false">
-	<importlibrary definition="comdlg32.spec.def" />
-	<include base="comdlg32">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<library>wine</library>
-	<library>uuid</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>gdi32</library>
-	<library>user32</library>
-	<library>comctl32</library>
-	<library>shell32</library>
-	<library>shlwapi</library>
-	<library>winspool</library>
-	<file>cdlg32.c</file>
-	<file>colordlg.c</file>
-	<file>filedlg.c</file>
-	<file>filedlg31.c</file>
-	<file>filedlgbrowser.c</file>
-	<file>filetitle.c</file>
-	<file>finddlg32.c</file>
-	<file>fontdlg.c</file>
-	<file>printdlg.c</file>
-	<file>rsrc.rc</file>
-	<file>comdlg32.spec</file>
-</module>
+<module name="comdlg32" type="win32dll"
baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32"
installname="comdlg32.dll" warnings="true" usewrc="false">
+	<importlibrary definition="comdlg32.spec.def" />
+	<include base="comdlg32">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>wine</library>
+	<library>uuid</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>gdi32</library>
+	<library>user32</library>
+	<library>comctl32</library>
+	<library>shell32</library>
+	<library>shlwapi</library>
+	<library>winspool</library>
+	<file>cdlg32.c</file>
+	<file>colordlg.c</file>
+	<file>filedlg.c</file>
+	<file>filedlg31.c</file>
+	<file>filedlgbrowser.c</file>
+	<file>filetitle.c</file>
+	<file>finddlg32.c</file>
+	<file>fontdlg.c</file>
+	<file>printdlg.c</file>
+	<file>rsrc.rc</file>
+	<file>comdlg32.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml
--- branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,36 +1,34 @@

-<module name="dbghelp" type="win32dll"
baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32"
installname="dbghelp.dll" warnings="true">
-	<importlibrary definition="dbghelp.spec.def" />
-	<include base="dbghelp">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<library>wine</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>psapi</library>
-	<library>pseh</library>
-	<file>coff.c</file>
-	<file>dbghelp.c</file>
-	<file>elf_module.c</file>
-	<file>image.c</file>
-	<file>memory.c</file>
-	<file>minidump.c</file>
-	<file>module.c</file>
-	<file>msc.c</file>
-	<file>path.c</file>
-	<file>pe_module.c</file>
-	<file>regex.c</file>
-	<file>source.c</file>
-	<file>stabs.c</file>
-	<file>stack.c</file>
-	<file>storage.c</file>
-	<file>symbol.c</file>
-	<file>type.c</file>
-	<file>dbghelp.rc</file>
-	<file>dbghelp.spec</file>
-</module>
+<module name="dbghelp" type="win32dll"
baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32"
installname="dbghelp.dll" warnings="true">
+	<importlibrary definition="dbghelp.spec.def" />
+	<include base="dbghelp">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>psapi</library>
+	<library>pseh</library>
+	<file>coff.c</file>
+	<file>dbghelp.c</file>
+	<file>elf_module.c</file>
+	<file>image.c</file>
+	<file>memory.c</file>
+	<file>minidump.c</file>
+	<file>module.c</file>
+	<file>msc.c</file>
+	<file>path.c</file>
+	<file>pe_module.c</file>
+	<file>regex.c</file>
+	<file>source.c</file>
+	<file>stabs.c</file>
+	<file>stack.c</file>
+	<file>storage.c</file>
+	<file>symbol.c</file>
+	<file>type.c</file>
+	<file>dbghelp.rc</file>
+	<file>dbghelp.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml
--- branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,21 +1,19 @@

-<module name="msvfw32" type="win32dll"
baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32"
installname="msvfw32.dll">
-	<importlibrary definition="msvfw32.spec.def" />
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<library>winmm</library>
-	<library>gdi32</library>
-	<library>comctl32</library>
-	<library>kernel32</library>
-	<library>ntdll</library>
-	<file>drawdib.c</file>
-	<file>mciwnd.c</file>
-	<file>msvfw32.rc</file>
-	<file>msvideo_main.c</file>
-	<file>msvfw32.spec</file>
-</module>
+<module name="msvfw32" type="win32dll"
baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32"
installname="msvfw32.dll">
+	<importlibrary definition="msvfw32.spec.def" />
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>winmm</library>
+	<library>gdi32</library>
+	<library>comctl32</library>
+	<library>kernel32</library>
+	<library>ntdll</library>
+	<file>drawdib.c</file>
+	<file>mciwnd.c</file>
+	<file>msvfw32.rc</file>
+	<file>msvideo_main.c</file>
+	<file>msvfw32.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml
--- branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,30 +1,28 @@

-<module name="netapi32" type="win32dll"
baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32"
installname="netapi32.dll" warnings="true">
-	<importlibrary definition="netapi32.spec.def" />
-	<include base="netapi32">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<define name="_SVRAPI_" />
-	<library>wine</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>ws2_32</library>
-	<library>iphlpapi</library>
-	<file>access.c</file>
-	<file>apibuf.c</file>
-	<file>browsr.c</file>
-	<file>nbcmdqueue.c</file>
-	<file>nbnamecache.c</file>
-	<file>nbt.c</file>
-	<file>netapi32.c</file>
-	<file>netbios.c</file>
-	<file>wksta.c</file>
-	<file>netapi32.rc</file>
-	<file>netapi32.spec</file>
-</module>
+<module name="netapi32" type="win32dll"
baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32"
installname="netapi32.dll" warnings="true">
+	<importlibrary definition="netapi32.spec.def" />
+	<include base="netapi32">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<define name="_SVRAPI_" />
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>ws2_32</library>
+	<library>iphlpapi</library>
+	<file>access.c</file>
+	<file>apibuf.c</file>
+	<file>browsr.c</file>
+	<file>nbcmdqueue.c</file>
+	<file>nbnamecache.c</file>
+	<file>nbt.c</file>
+	<file>netapi32.c</file>
+	<file>netbios.c</file>
+	<file>wksta.c</file>
+	<file>netapi32.rc</file>
+	<file>netapi32.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml
--- branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,54 +1,52 @@

-<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}"
installbase="system32" installname="ole32.dll" warnings="true">
-	<importlibrary definition="ole32.spec.def" />
-	<include base="ole32">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<define name="_STDDEF_H" />
-	<library>wine</library>
-	<library>uuid</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>gdi32</library>
-	<library>user32</library>
-	<library>rpcrt4</library>
-	<file>antimoniker.c</file>
-	<file>bindctx.c</file>
-	<file>clipboard.c</file>
-	<file>compobj.c</file>
-	<file>compositemoniker.c</file>
-	<file>datacache.c</file>
-	<file>dictionary.c</file>
-	<file>defaulthandler.c</file>
-	<file>errorinfo.c</file>
-	<file>filemoniker.c</file>
-	<file>ftmarshal.c</file>
-	<file>git.c</file>
-	<file>hglobalstream.c</file>
-	<file>ifs.c</file>
-	<file>itemmoniker.c</file>
-	<file>marshal.c</file>
-	<file>memlockbytes.c</file>
-	<file>moniker.c</file>
-	<file>ole2.c</file>
-	<file>ole2stubs.c</file>
-	<file>ole2impl.c</file>
-	<file>ole32_main.c</file>
-	<file>oleobj.c</file>
-	<file>oleproxy.c</file>
-	<file>regsvr.c</file>
-	<file>rpc.c</file>
-	<file>stg_bigblockfile.c</file>
-	<file>stg_prop.c</file>
-	<file>stg_stream.c</file>
-	<file>storage32.c</file>
-	<file>stubmanager.c</file>
-	<file>ole32res.rc</file>
-	<file>ole32.spec</file>
-</module>
+<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}"
installbase="system32" installname="ole32.dll" warnings="true">
+	<importlibrary definition="ole32.spec.def" />
+	<include base="ole32">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<define name="_STDDEF_H" />
+	<library>wine</library>
+	<library>uuid</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>gdi32</library>
+	<library>user32</library>
+	<library>rpcrt4</library>
+	<file>antimoniker.c</file>
+	<file>bindctx.c</file>
+	<file>clipboard.c</file>
+	<file>compobj.c</file>
+	<file>compositemoniker.c</file>
+	<file>datacache.c</file>
+	<file>dictionary.c</file>
+	<file>defaulthandler.c</file>
+	<file>errorinfo.c</file>
+	<file>filemoniker.c</file>
+	<file>ftmarshal.c</file>
+	<file>git.c</file>
+	<file>hglobalstream.c</file>
+	<file>ifs.c</file>
+	<file>itemmoniker.c</file>
+	<file>marshal.c</file>
+	<file>memlockbytes.c</file>
+	<file>moniker.c</file>
+	<file>ole2.c</file>
+	<file>ole2stubs.c</file>
+	<file>ole2impl.c</file>
+	<file>ole32_main.c</file>
+	<file>oleobj.c</file>
+	<file>oleproxy.c</file>
+	<file>regsvr.c</file>
+	<file>rpc.c</file>
+	<file>stg_bigblockfile.c</file>
+	<file>stg_prop.c</file>
+	<file>stg_stream.c</file>
+	<file>storage32.c</file>
+	<file>stubmanager.c</file>
+	<file>ole32res.rc</file>
+	<file>ole32.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml
--- branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,45 +1,43 @@

-<module name="oleaut32" type="win32dll"
baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32"
installname="oleaut32.dll" warnings="true">
-	<importlibrary definition="oleaut32.spec.def" />
-	<include base="oleaut32">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<define name="_STDDEF_H" />
-	<define name="_OLEAUT32_" />
-	<define name="COM_NO_WINDOWS_H" />
-	<library>wine</library>
-	<library>uuid</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>gdi32</library>
-	<library>user32</library>
-	<library>rpcrt4</library>
-	<library>ole32</library>
-	<library>comctl32</library>
-	<library>urlmon</library>
-	<file>connpt.c</file>
-	<file>dispatch.c</file>
-	<file>hash.c</file>
-	<file>oaidl_p.c</file>
-	<file>oleaut.c</file>
-	<file>olefont.c</file>
-	<file>olepicture.c</file>
-	<file>recinfo.c</file>
-	<file>regsvr.c</file>
-	<file>safearray.c</file>
-	<file>stubs.c</file>
-	<file>tmarshal.c</file>
-	<file>typelib.c</file>
-	<file>typelib2.c</file>
-	<file>usrmarshal.c</file>
-	<file>varformat.c</file>
-	<file>variant.c</file>
-	<file>vartype.c</file>
-	<file>oleaut32.spec</file>
-</module>
+<module name="oleaut32" type="win32dll"
baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32"
installname="oleaut32.dll" warnings="true">
+	<importlibrary definition="oleaut32.spec.def" />
+	<include base="oleaut32">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<define name="_STDDEF_H" />
+	<define name="_OLEAUT32_" />
+	<define name="COM_NO_WINDOWS_H" />
+	<library>wine</library>
+	<library>uuid</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>gdi32</library>
+	<library>user32</library>
+	<library>rpcrt4</library>
+	<library>ole32</library>
+	<library>comctl32</library>
+	<library>urlmon</library>
+	<file>connpt.c</file>
+	<file>dispatch.c</file>
+	<file>hash.c</file>
+	<file>oaidl_p.c</file>
+	<file>oleaut.c</file>
+	<file>olefont.c</file>
+	<file>olepicture.c</file>
+	<file>recinfo.c</file>
+	<file>regsvr.c</file>
+	<file>safearray.c</file>
+	<file>stubs.c</file>
+	<file>tmarshal.c</file>
+	<file>typelib.c</file>
+	<file>typelib2.c</file>
+	<file>usrmarshal.c</file>
+	<file>varformat.c</file>
+	<file>variant.c</file>
+	<file>vartype.c</file>
+	<file>oleaut32.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml
--- branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,19 +1,17 @@

-<module name="olepro32" type="win32dll"
baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32"
installname="olepro32.dll">
-	<importlibrary definition="olepro32.spec.def" />
-	<include base="olepro32">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<library>wine</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>oleaut32</library>
-	<file>olepro32stubs.c</file>
-	<file>olepro32.rc</file>
-	<file>olepro32.spec</file>
-</module>
+<module name="olepro32" type="win32dll"
baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32"
installname="olepro32.dll">
+	<importlibrary definition="olepro32.spec.def" />
+	<include base="olepro32">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>oleaut32</library>
+	<file>olepro32stubs.c</file>
+	<file>olepro32.rc</file>
+	<file>olepro32.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml
--- branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -2,8 +2,6 @@

<importlibrary definition="riched20.spec.def" />
    <include base="riched20">.</include>
    <include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
    <define name="__REACTOS__" />
    <define name="__USE_W32API" />
    <define name="_WIN32_IE">0x600</define>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml
--- branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,19 +1,17 @@

-<module name="riched32" type="win32dll"
baseaddress="${BASEADDRESS_RICHED32}" installbase="system32"
installname="riched32.dll">
-	<importlibrary definition="riched32.spec.def" />
-	<include base="riched32">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<library>wine</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>user32</library>
-	<library>riched20</library>
-	<file>richedit.c</file>
-	<file>riched32.spec</file>
-</module>
+<module name="riched32" type="win32dll"
baseaddress="${BASEADDRESS_RICHED32}" installbase="system32"
installname="riched32.dll">
+	<importlibrary definition="riched32.spec.def" />
+	<include base="riched32">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>riched20</library>
+	<file>richedit.c</file>
+	<file>riched32.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml
--- branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,37 +1,35 @@

-<module name="rpcrt4" type="win32dll"
baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32"
installname="rpcrt4.dll" warnings="true">
-	<importlibrary definition="rpcrt4.spec.def" />
-	<include base="rpcrt4">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<define name="_STDDEF_H" />
-	<define name="_RPCRT4_" />
-	<define name="COM_NO_WINDOWS_H" />
-	<define name="MSWMSG" />
-	<library>wine</library>
-	<library>uuid</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>iphlpapi</library>
-	<file>cproxy.c</file>
-	<file>cpsf.c</file>
-	<file>cstub.c</file>
-	<file>ndr_marshall.c</file>
-	<file>ndr_midl.c</file>
-	<file>ndr_ole.c</file>
-	<file>ndr_stubless.c</file>
-	<file>rpc_binding.c</file>
-	<file>rpc_epmap.c</file>
-	<file>rpc_message.c</file>
-	<file>rpc_server.c</file>
-	<file>rpcrt4_main.c</file>
-	<file>rpcss_np_client.c</file>
-	<file>rpcrt4.rc</file>
-	<file>rpcrt4.spec</file>
-</module>
+<module name="rpcrt4" type="win32dll"
baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32"
installname="rpcrt4.dll" warnings="true">
+	<importlibrary definition="rpcrt4.spec.def" />
+	<include base="rpcrt4">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<define name="_STDDEF_H" />
+	<define name="_RPCRT4_" />
+	<define name="COM_NO_WINDOWS_H" />
+	<define name="MSWMSG" />
+	<library>wine</library>
+	<library>uuid</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>iphlpapi</library>
+	<file>cproxy.c</file>
+	<file>cpsf.c</file>
+	<file>cstub.c</file>
+	<file>ndr_marshall.c</file>
+	<file>ndr_midl.c</file>
+	<file>ndr_ole.c</file>
+	<file>ndr_stubless.c</file>
+	<file>rpc_binding.c</file>
+	<file>rpc_epmap.c</file>
+	<file>rpc_message.c</file>
+	<file>rpc_server.c</file>
+	<file>rpcrt4_main.c</file>
+	<file>rpcss_np_client.c</file>
+	<file>rpcrt4.rc</file>
+	<file>rpcrt4.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml
--- branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,32 +1,30 @@

-<module name="shdocvw" type="win32dll"
baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32"
installname="shdocvw.dll" usewrc="false" warnings="true">
-	<importlibrary definition="shdocvw.spec.def" />
-	<include base="shdocvw">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<define name="_SHDOCVW_" />
-	<library>wine</library>
-	<library>uuid</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>user32</library>
-	<library>ole32</library>
-	<library>urlmon</library>
-	<file>classinfo.c</file>
-	<file>events.c</file>
-	<file>factory.c</file>
-	<file>misc.c</file>
-	<file>oleobject.c</file>
-	<file>persist.c</file>
-	<file>regsvr.c</file>
-	<file>shdocvw_main.c</file>
-	<file>webbrowser.c</file>
-	<file>shdocvw.rc</file>
-	<file>shdocvw.spec</file>
-</module>
+<module name="shdocvw" type="win32dll"
baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32"
installname="shdocvw.dll" usewrc="false" warnings="true">
+	<importlibrary definition="shdocvw.spec.def" />
+	<include base="shdocvw">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<define name="_SHDOCVW_" />
+	<library>wine</library>
+	<library>uuid</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>user32</library>
+	<library>ole32</library>
+	<library>urlmon</library>
+	<file>classinfo.c</file>
+	<file>events.c</file>
+	<file>factory.c</file>
+	<file>misc.c</file>
+	<file>oleobject.c</file>
+	<file>persist.c</file>
+	<file>regsvr.c</file>
+	<file>shdocvw_main.c</file>
+	<file>webbrowser.c</file>
+	<file>shdocvw.rc</file>
+	<file>shdocvw.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml
--- branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,42 +1,40 @@

-<module name="shlwapi" type="win32dll"
baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32"
installname="shlwapi.dll" warnings="true">
-	<importlibrary definition="shlwapi.spec.def" />
-	<include base="shlwapi">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<define name="_SHLWAPI_"/>
-	<define name="WINSHLWAPI">""</define>
-	<linkerflag>-nostdlib</linkerflag>
-	<linkerflag>-lgcc</linkerflag>
-	<library>wine</library>
-	<library>uuid</library>
-	<library>msvcrt</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>gdi32</library>
-	<library>user32</library>
-	<library>ole32</library>
-	<library>oleaut32</library>
-	<file>assoc.c</file>
-	<file>clist.c</file>
-	<file>istream.c</file>
-	<file>msgbox.c</file>
-	<file>ordinal.c</file>
-	<file>path.c</file>
-	<file>reg.c</file>
-	<file>regstream.c</file>
-	<file>shlwapi_main.c</file>
-	<file>stopwatch.c</file>
-	<file>string.c</file>
-	<file>thread.c</file>
-	<file>url.c</file>
-	<file>wsprintf.c</file>
-	<file>shlwapi.rc</file>
-	<file>shlwapi.spec</file>
-</module>
+<module name="shlwapi" type="win32dll"
baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32"
installname="shlwapi.dll" warnings="true">
+	<importlibrary definition="shlwapi.spec.def" />
+	<include base="shlwapi">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<define name="_SHLWAPI_"/>
+	<define name="WINSHLWAPI">""</define>
+	<linkerflag>-nostdlib</linkerflag>
+	<linkerflag>-lgcc</linkerflag>
+	<library>wine</library>
+	<library>uuid</library>
+	<library>msvcrt</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>gdi32</library>
+	<library>user32</library>
+	<library>ole32</library>
+	<library>oleaut32</library>
+	<file>assoc.c</file>
+	<file>clist.c</file>
+	<file>istream.c</file>
+	<file>msgbox.c</file>
+	<file>ordinal.c</file>
+	<file>path.c</file>
+	<file>reg.c</file>
+	<file>regstream.c</file>
+	<file>shlwapi_main.c</file>
+	<file>stopwatch.c</file>
+	<file>string.c</file>
+	<file>thread.c</file>
+	<file>url.c</file>
+	<file>wsprintf.c</file>
+	<file>shlwapi.rc</file>
+	<file>shlwapi.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml
--- branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,29 +1,27 @@

-<module name="urlmon" type="win32dll"
baseaddress="${BASEADDRESS_URLMON}" installbase="system32"
installname="urlmon.dll" warnings="true">
-	<importlibrary definition="urlmon.spec.def" />
-	<include base="urlmon">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<define name="_STDDEF_H" />
-	<library>wine</library>
-	<library>uuid</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>user32</library>
-	<library>ole32</library>
-	<library>shlwapi</library>
-	<library>cabinet</library>
-	<library>wininet</library>
-	<file>regsvr.c</file>
-	<file>sec_mgr.c</file>
-	<file>umon.c</file>
-	<file>umstream.c</file>
-	<file>urlmon_main.c</file>
-	<file>urlmon.spec</file>
-</module>
+<module name="urlmon" type="win32dll"
baseaddress="${BASEADDRESS_URLMON}" installbase="system32"
installname="urlmon.dll" warnings="true">
+	<importlibrary definition="urlmon.spec.def" />
+	<include base="urlmon">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<define name="_STDDEF_H" />
+	<library>wine</library>
+	<library>uuid</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>user32</library>
+	<library>ole32</library>
+	<library>shlwapi</library>
+	<library>cabinet</library>
+	<library>wininet</library>
+	<file>regsvr.c</file>
+	<file>sec_mgr.c</file>
+	<file>umon.c</file>
+	<file>umstream.c</file>
+	<file>urlmon_main.c</file>
+	<file>urlmon.spec</file>
+</module>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml
--- branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -2,8 +2,6 @@

<importlibrary definition="wininet.spec.def" />
    <include base="wininet">.</include>
    <include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
    <define name="__REACTOS__" />
    <define name="__USE_W32API" />
    <define name="_WIN32_IE">0x600</define>
  _____

Modified: branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml
--- branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml
2005-08-03 17:10:30 UTC (rev 17011)
+++ branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml
2005-08-03 17:10:45 UTC (rev 17012)
@@ -1,27 +1,25 @@

-<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}"
installbase="system32" installname="winmm.dll" warnings="true">
-	<importlibrary definition="winmm.spec.def" />
-	<include base="winmm">.</include>
-	<include base="ReactOS">include/wine</include>
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	<define name="__REACTOS__" />
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
-	<define name="WINVER">0x501</define>
-	<library>wine</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>user32</library>
-	<file>driver.c</file>
-	<file>joystick.c</file>
-	<file>lolvldrv.c</file>
-	<file>mci.c</file>
-	<file>mmio.c</file>
-	<file>playsound.c</file>
-	<file>time.c</file>
-	<file>winmm.c</file>
-	<file>winmm_res.rc</file>
-	<file>winmm.spec</file>
-</module>
+<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}"
installbase="system32" installname="winmm.dll" warnings="true">
+	<importlibrary definition="winmm.spec.def" />
+	<include base="winmm">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
[truncated at 1000 lines; 16 more skipped]