Build Wine DLLs without the UNICODE and _UNICODE definitions. (Note: The Wine DLLs...

svn path=/trunk/; revision=16725

diff --git a/reactos/lib/comctl32/comctl32.xml b/reactos/lib/comctl32/comctl32.xml
index e89311f..ca7aae0 100644 (file)
--- a/reactos/lib/comctl32/comctl32.xml
+++ b/reactos/lib/comctl32/comctl32.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/comdlg32/comdlg32.xml b/reactos/lib/comdlg32/comdlg32.xml
index c70f749..be494cb 100644 (file)
--- a/reactos/lib/comdlg32/comdlg32.xml
+++ b/reactos/lib/comdlg32/comdlg32.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/dbghelp/dbghelp.xml b/reactos/lib/dbghelp/dbghelp.xml
index a043d24..ccf516d 100644 (file)
--- a/reactos/lib/dbghelp/dbghelp.xml
+++ b/reactos/lib/dbghelp/dbghelp.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/msvideo/msvfw32.xml b/reactos/lib/msvideo/msvfw32.xml
index eedb4c9..d8bc0c9 100644 (file)
--- a/reactos/lib/msvideo/msvfw32.xml
+++ b/reactos/lib/msvideo/msvfw32.xml
@@ -1,8 +1,6 @@
 <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>

diff --git a/reactos/lib/netapi32/netapi32.xml b/reactos/lib/netapi32/netapi32.xml
index 4844f40..2f1e5ab 100644 (file)
--- a/reactos/lib/netapi32/netapi32.xml
+++ b/reactos/lib/netapi32/netapi32.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/ole32/ole32.xml b/reactos/lib/ole32/ole32.xml
index 1e6de8c..d9e044f 100644 (file)
--- a/reactos/lib/ole32/ole32.xml
+++ b/reactos/lib/ole32/ole32.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/oleaut32/oleaut32.xml b/reactos/lib/oleaut32/oleaut32.xml
index 9515595..9f80ce2 100644 (file)
--- a/reactos/lib/oleaut32/oleaut32.xml
+++ b/reactos/lib/oleaut32/oleaut32.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/olepro32/olepro32.xml b/reactos/lib/olepro32/olepro32.xml
index 779d8db..0333bfc 100644 (file)
--- a/reactos/lib/olepro32/olepro32.xml
+++ b/reactos/lib/olepro32/olepro32.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/riched20/riched20.xml b/reactos/lib/riched20/riched20.xml
index 3f5cfd4..fe6e68d 100644 (file)
--- a/reactos/lib/riched20/riched20.xml
+++ b/reactos/lib/riched20/riched20.xml
@@ -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>

diff --git a/reactos/lib/richedit/riched32.xml b/reactos/lib/richedit/riched32.xml
index 4a6a833..992aac6 100644 (file)
--- a/reactos/lib/richedit/riched32.xml
+++ b/reactos/lib/richedit/riched32.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/rpcrt4/rpcrt4.xml b/reactos/lib/rpcrt4/rpcrt4.xml
index bea2977..bf35363 100644 (file)
--- a/reactos/lib/rpcrt4/rpcrt4.xml
+++ b/reactos/lib/rpcrt4/rpcrt4.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/shdocvw/shdocvw.xml b/reactos/lib/shdocvw/shdocvw.xml
index bd29bdd..9f7677d 100644 (file)
--- a/reactos/lib/shdocvw/shdocvw.xml
+++ b/reactos/lib/shdocvw/shdocvw.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/shlwapi/shlwapi.xml b/reactos/lib/shlwapi/shlwapi.xml
index 426b1cc..95f6edd 100644 (file)
--- a/reactos/lib/shlwapi/shlwapi.xml
+++ b/reactos/lib/shlwapi/shlwapi.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/urlmon/urlmon.xml b/reactos/lib/urlmon/urlmon.xml
index 5d2f792..5ead311 100644 (file)
--- a/reactos/lib/urlmon/urlmon.xml
+++ b/reactos/lib/urlmon/urlmon.xml
@@ -2,8 +2,6 @@
        <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>

diff --git a/reactos/lib/wininet/wininet.xml b/reactos/lib/wininet/wininet.xml
index cf0a497..993f207 100644 (file)
--- a/reactos/lib/wininet/wininet.xml
+++ b/reactos/lib/wininet/wininet.xml
@@ -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>

diff --git a/reactos/lib/winmm/winmm.xml b/reactos/lib/winmm/winmm.xml
index e876439..864efd7 100644 (file)
--- a/reactos/lib/winmm/winmm.xml
+++ b/reactos/lib/winmm/winmm.xml
@@ -2,8 +2,6 @@
        <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>