32 files changed, 4957 insertions, 24 deletions
diff --git a/cppe/CHANGES b/cppe/CHANGES
index cb54aad7fe9..87e802c2b65 100644
--- a/cppe/CHANGES
+++ b/cppe/CHANGES
@@ -1,6 +1,10 @@
 Changes since version 1.1.0
 ---------------------------
 
+- Added support for the "cpp:type:wstring" slice metadata. When used
+  generated code will use std::wstring instead of std::string. See
+  manual for more details.
+
 - Added requestId to Current.
 
 
diff --git a/cppe/include/IceE/BasicStream.h b/cppe/include/IceE/BasicStream.h
index 7e6dca17ddd..fc968be6833 100644
--- a/cppe/include/IceE/BasicStream.h
+++ b/cppe/include/IceE/BasicStream.h
@@ -15,6 +15,7 @@
 #include <IceE/Buffer.h>
 #include <IceE/AutoArray.h>
 #include <IceE/Protocol.h>
+#include <IceE/Unicode.h>
 
 namespace Ice
 {
@@ -450,6 +451,40 @@ public:
     }
     void read(std::vector<std::string>&);
 
+    void write(const std::wstring& v)
+    {
+        std::string s = IceUtil::wstringToString(v);
+        Ice::Int sz = static_cast<Ice::Int>(s.size());
+        writeSize(sz);
+        if(sz > 0)
+        {
+            Container::size_type pos = b.size();
+            resize(pos + sz);
+            memcpy(&b[pos], s.c_str(), sz);
+        }
+    }
+    void write(const std::wstring*, const std::wstring*);
+    void read(std::wstring& v)
+    {
+        Ice::Int sz;
+        readSize(sz);
+        if(sz > 0)
+        {
+            if(b.end() - i < sz)
+            {
+                throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
+            }
+            std::string s(reinterpret_cast<const char*>(&*i), reinterpret_cast<const char*>(&*i) + sz);
+            IceUtil::stringToWstring(s).swap(v);
+            i += sz;
+        }
+        else
+        {
+            v.clear();
+        }
+    }
+    void read(std::vector<std::wstring>&);
+
     void write(const Ice::ObjectPrx&);
     void read(Ice::ObjectPrx&);
 
diff --git a/cppe/include/IceE/Config.h b/cppe/include/IceE/Config.h
index 0af91514943..1bcd826b5c7 100644
--- a/cppe/include/IceE/Config.h
+++ b/cppe/include/IceE/Config.h
@@ -129,7 +129,7 @@
 #   define ICE_DECLSPEC_IMPORT /**/
 #endif
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
 #   define ICE_DEPRECATED_API __declspec(deprecated)
 #elif defined(__GNUC__)
 #   define ICE_DEPRECATED_API __attribute__((deprecated))
diff --git a/cppe/include/IceE/Unicode.h b/cppe/include/IceE/Unicode.h
new file mode 100644
index 00000000000..a09c0b8c6f1
--- /dev/null
+++ b/cppe/include/IceE/Unicode.h
@@ -0,0 +1,156 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice-E is licensed to you under the terms described in the
+// ICEE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEE_UNICODE_H
+#define ICEE_UNICODE_H
+
+#include <IceE/Config.h>
+#include <IceE/Exception.h>
+
+namespace IceUtil
+{
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+
+//
+// With Visual C++ 7.x, wchar_t is either a typedef unsigned short or a 
+// native type (when /Zc:wchar_t is used).
+// Since wstring is a typedef basic_string<wchar_t>, its type is also 
+// different depending on whether /Zc:wchar_t is used or not.
+//
+// With Visual C++ 7.x, the default is typedef; with Visual C++ 8.0,
+// the default is native type.
+//
+// Ice is always built with the default, but provides wstringToString() 
+// and stringToWstring() implementations for both flavors of wstring.
+//
+
+#   if defined(_NATIVE_WCHAR_T_DEFINED)
+ICE_API std::string wstringToString(const std::wstring&);
+
+#      if _MSC_VER >= 1400
+//
+// Building or using with VC8
+//
+ICE_API std::wstring stringToWstring(const std::string&);
+ICE_API std::string wstringToString(const std::basic_string<unsigned short>&);
+ICE_API std::basic_string<unsigned short> stringToTypedefWstring(const std::string&);
+#     else
+//
+// Using a VC7.x build with the non-default /Zc
+//
+ICE_API std::wstring stringToNativeWstring(const std::string&);
+inline std::wstring 
+stringToWstring(const std::string& str)
+{
+    return stringToNativeWstring(str);
+}
+#     endif
+
+#   else
+ICE_API std::string wstringToString(const std::wstring&);
+
+#      if _MSC_VER < 1400
+//
+// Building or using with VC7.x
+//
+ICE_API std::wstring stringToWstring(const std::string&);
+ICE_API std::string wstringToString(const std::basic_string<__wchar_t>&);
+ICE_API std::basic_string<__wchar_t> stringToNativeWstring(const std::string&);
+#      else
+//
+// Using a VC8.x build the non-default /Zc
+//
+ICE_API std::wstring stringToTypedefWstring(const std::string&);
+inline std::wstring 
+stringToWstring(const std::string& str)
+{
+    return stringToTypedefWstring(str);
+}
+#      endif
+#   endif
+
+#else
+
+ICE_API std::string wstringToString(const std::wstring&);
+ICE_API std::wstring stringToWstring(const std::string&);
+
+#endif
+
+
+//
+// Converts UTF-8 byte-sequences to and from UTF-16 or UTF-32 (with native
+// endianness) depending on sizeof(wchar_t).
+//
+// These are thin wrappers over the UTF8/16/32 converters provided by 
+// unicode.org
+//
+//
+// TODO: provide the same support for /Zc:wchar_t as the functions above
+//
+
+enum ConversionResult
+{
+	conversionOK, 		/* conversion successful */
+	sourceExhausted,	/* partial character in source, but hit end */
+	targetExhausted,	/* insuff. room in target for conversion */
+	sourceIllegal		/* source sequence is illegal/malformed */
+};
+
+
+enum ConversionFlags 
+{
+    strictConversion = 0,
+    lenientConversion
+};
+
+typedef unsigned char Byte;
+
+ICE_API bool
+isLegalUTF8Sequence(const Byte* source, const Byte* end);
+
+ICE_API ConversionResult 
+convertUTFWstringToUTF8(const wchar_t*& sourceStart, const wchar_t* sourceEnd, 
+			Byte*& targetStart, Byte* targetEnd, ConversionFlags flags);
+
+ICE_API ConversionResult
+convertUTF8ToUTFWstring(const Byte*& sourceStart, const Byte* sourceEnd, 
+			wchar_t*& targetStart, wchar_t* targetEnd, ConversionFlags flags);
+
+ICE_API ConversionResult 
+convertUTF8ToUTFWstring(const Byte*& sourceStart, const Byte* sourceEnd, 
+			std::wstring& target, ConversionFlags flags);
+
+
+
+
+//
+// UTFConversionException is raised by wstringToString() or stringToWstring()
+// to report a conversion error 
+//
+class ICE_API UTFConversionException : public Exception
+{
+public:
+    
+    UTFConversionException(const char*, int, ConversionResult);
+    virtual const std::string ice_name() const;
+    virtual std::string toString() const;
+    virtual Exception* ice_clone() const;
+    virtual void ice_throw() const;
+
+    ConversionResult conversionResult() const;
+private:
+
+    const ConversionResult _conversionResult;
+    static const char* _name;    
+};
+
+}
+
+#endif
diff --git a/cppe/src/IceE/BasicStream.cpp b/cppe/src/IceE/BasicStream.cpp
index 3275ac724fb..c47bde6e269 100644
--- a/cppe/src/IceE/BasicStream.cpp
+++ b/cppe/src/IceE/BasicStream.cpp
@@ -1327,6 +1327,43 @@ IceInternal::BasicStream::read(vector<string>& v)
 }
 
 void
+IceInternal::BasicStream::write(const wstring* begin, const wstring* end)
+{
+    Int sz = static_cast<Int>(end - begin);
+    writeSize(sz);
+    if(sz > 0)
+    {
+        for(int i = 0; i < sz; ++i)
+        {
+            write(begin[i]);
+        }
+    }
+}   
+    
+void
+IceInternal::BasicStream::read(vector<wstring>& v)
+{   
+    Int sz;
+    readSize(sz);
+    if(sz > 0)
+    {
+        startSeq(sz, 1);
+        v.resize(sz);
+        for(int j = 0; j < sz; ++j)
+        {
+            read(v[j]);
+            checkSeq();
+            endElement();
+        }
+        endSeq(sz);
+    }
+    else
+    {
+       v.clear();
+    }
+}
+
+void
 IceInternal::BasicStream::write(const ObjectPrx& v)
 {
     _instance->proxyFactory()->proxyToStream(v, this);
diff --git a/cppe/src/IceE/ConvertUTF.cpp b/cppe/src/IceE/ConvertUTF.cpp
new file mode 100755
index 00000000000..2282028f10e
--- /dev/null
+++ b/cppe/src/IceE/ConvertUTF.cpp
@@ -0,0 +1,449 @@
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ * 
+ * Disclaimer
+ * 
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ * 
+ * Limitations on Rights to Redistribute This Code
+ * 
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+// **********************************************************************
+//
+// Copyright (c) 2006 ZeroC, Inc. All rights reserved.
+//
+// This file was slightly modified to move the definitions to the
+// IceUtil namespace and use C++ types.
+//
+// **********************************************************************
+
+
+/* ---------------------------------------------------------------------
+
+    Conversions between UTF32, UTF-16, and UTF-8. Source code file.
+    Author: Mark E. Davis, 1994.
+    Rev History: Rick McGowan, fixes & updates May 2001.
+    Sept 2001: fixed const & error conditions per
+	mods suggested by S. Parent & A. Lillich.
+    June 2002: Tim Dodd added detection and handling of incomplete
+	source sequences, enhanced error detection, added casts
+	to eliminate compiler warnings.
+    July 2003: slight mods to back out aggressive FFFE detection.
+    Jan 2004: updated switches in from-UTF8 conversions.
+    Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions.
+
+    See the header file "ConvertUTF.h" for complete documentation.
+
+------------------------------------------------------------------------ */
+
+
+#include <IceE/ConvertUTF.h>
+
+#ifdef CVTUTF_DEBUG
+#include <stdio.h>
+#endif
+
+namespace IceUtil
+{
+
+static const int halfShift  = 10; /* used for shifting by 10 bits */
+
+static const UTF32 halfBase = 0x0010000UL;
+static const UTF32 halfMask = 0x3FFUL;
+
+#define UNI_SUR_HIGH_START  (UTF32)0xD800
+#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
+#define UNI_SUR_LOW_START   (UTF32)0xDC00
+#define UNI_SUR_LOW_END     (UTF32)0xDFFF
+// #define false	   0
+// #define true	    1
+
+
+/* --------------------------------------------------------------------- */
+
+/*
+ * Index into the table below with the first byte of a UTF-8 sequence to
+ * get the number of trailing bytes that are supposed to follow it.
+ * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
+ * left as-is for anyone who may want to do such conversion, which was
+ * allowed in earlier algorithms.
+ */
+static const char trailingBytesForUTF8[256] = {
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+/*
+ * Magic values subtracted from a buffer value during UTF8 conversion.
+ * This table contains as many values as there might be trailing bytes
+ * in a UTF-8 sequence.
+ */
+static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, 
+		     0x03C82080UL, 0xFA082080UL, 0x82082080UL };
+
+/*
+ * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
+ * into the first byte, depending on how many bytes follow.  There are
+ * as many entries in this table as there are UTF-8 sequence types.
+ * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
+ * for *legal* UTF-8 will be 4 or fewer bytes total.
+ */
+static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+/* --------------------------------------------------------------------- */
+
+/* The interface converts a whole buffer to avoid function-call overhead.
+ * Constants have been gathered. Loops & conditionals have been removed as
+ * much as possible for efficiency, in favor of drop-through switches.
+ * (See "Note A" at the bottom of the file for equivalent code.)
+ * If your compiler supports it, the "isLegalUTF8" call can be turned
+ * into an inline function.
+ */
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF16toUTF8 (
+	const UTF16** sourceStart, const UTF16* sourceEnd, 
+	UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
+    ConversionResult result = conversionOK;
+    const UTF16* source = *sourceStart;
+    UTF8* target = *targetStart;
+    while (source < sourceEnd) {
+	UTF32 ch;
+	unsigned short bytesToWrite = 0;
+	const UTF32 byteMask = 0xBF;
+	const UTF32 byteMark = 0x80; 
+	const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
+	ch = *source++;
+	/* If we have a surrogate pair, convert to UTF32 first. */
+	if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
+	    /* If the 16 bits following the high surrogate are in the source buffer... */
+	    if (source < sourceEnd) {
+		UTF32 ch2 = *source;
+		/* If it's a low surrogate, convert to UTF32. */
+		if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
+		    ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
+			+ (ch2 - UNI_SUR_LOW_START) + halfBase;
+		    ++source;
+		} else if (flags == strictConversion) { /* it's an unpaired high surrogate */
+		    --source; /* return to the illegal value itself */
+		    result = sourceIllegal;
+		    break;
+		}
+	    } else { /* We don't have the 16 bits following the high surrogate. */
+		--source; /* return to the high surrogate */
+		result = sourceExhausted;
+		break;
+	    }
+	} else if (flags == strictConversion) {
+	    /* UTF-16 surrogate values are illegal in UTF-32 */
+	    if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
+		--source; /* return to the illegal value itself */
+		result = sourceIllegal;
+		break;
+	    }
+	}
+	/* Figure out how many bytes the result will require */
+	if (ch < (UTF32)0x80) {	     bytesToWrite = 1;
+	} else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
+	} else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
+	} else if (ch < (UTF32)0x110000) {  bytesToWrite = 4;
+	} else {			    bytesToWrite = 3;
+					    ch = UNI_REPLACEMENT_CHAR;
+	}
+
+	target += bytesToWrite;
+	if (target > targetEnd) {
+	    source = oldSource; /* Back up source pointer! */
+	    target -= bytesToWrite; result = targetExhausted; break;
+	}
+	switch (bytesToWrite) { /* note: everything falls through. */
+	    case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+	    case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+	    case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+	    case 1: *--target =  (UTF8)(ch | firstByteMark[bytesToWrite]);
+	}
+	target += bytesToWrite;
+    }
+    *sourceStart = source;
+    *targetStart = target;
+    return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+/*
+ * Utility routine to tell whether a sequence of bytes is legal UTF-8.
+ * This must be called with the length pre-determined by the first byte.
+ * If not calling this from ConvertUTF8to*, then the length can be set by:
+ *  length = trailingBytesForUTF8[*source]+1;
+ * and the sequence is illegal right away if there aren't that many bytes
+ * available.
+ * If presented with a length > 4, this returns false.  The Unicode
+ * definition of UTF-8 goes up to 4-byte sequences.
+ */
+
+static Boolean isLegalUTF8(const UTF8 *source, int length) {
+    UTF8 a;
+    const UTF8 *srcptr = source+length;
+    switch (length) {
+    default: return false;
+	/* Everything else falls through when "true"... */
+    case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
+    case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
+    case 2: if ((a = (*--srcptr)) > 0xBF) return false;
+
+	switch (*source) {
+	    /* no fall-through in this inner switch */
+	    case 0xE0: if (a < 0xA0) return false; break;
+	    case 0xED: if (a > 0x9F) return false; break;
+	    case 0xF0: if (a < 0x90) return false; break;
+	    case 0xF4: if (a > 0x8F) return false; break;
+	    default:   if (a < 0x80) return false;
+	}
+
+    case 1: if (*source >= 0x80 && *source < 0xC2) return false;
+    }
+    if (*source > 0xF4) return false;
+    return true;
+}
+
+/* --------------------------------------------------------------------- */
+
+/*
+ * Exported function to return whether a UTF-8 sequence is legal or not.
+ * This is not used here; it's just exported.
+ */
+Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
+    int length = trailingBytesForUTF8[*source]+1;
+    if (source+length > sourceEnd) {
+	return false;
+    }
+    return isLegalUTF8(source, length);
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF8toUTF16 (
+	const UTF8** sourceStart, const UTF8* sourceEnd, 
+	UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
+    ConversionResult result = conversionOK;
+    const UTF8* source = *sourceStart;
+    UTF16* target = *targetStart;
+    while (source < sourceEnd) {
+	UTF32 ch = 0;
+	unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+	if (source + extraBytesToRead >= sourceEnd) {
+	    result = sourceExhausted; break;
+	}
+	/* Do this check whether lenient or strict */
+	if (! isLegalUTF8(source, extraBytesToRead+1)) {
+	    result = sourceIllegal;
+	    break;
+	}
+	/*
+	 * The cases all fall through. See "Note A" below.
+	 */
+	switch (extraBytesToRead) {
+	    case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
+	    case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
+	    case 3: ch += *source++; ch <<= 6;
+	    case 2: ch += *source++; ch <<= 6;
+	    case 1: ch += *source++; ch <<= 6;
+	    case 0: ch += *source++;
+	}
+	ch -= offsetsFromUTF8[extraBytesToRead];
+
+	if (target >= targetEnd) {
+	    source -= (extraBytesToRead+1); /* Back up source pointer! */
+	    result = targetExhausted; break;
+	}
+	if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
+	    /* UTF-16 surrogate values are illegal in UTF-32 */
+	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+		if (flags == strictConversion) {
+		    source -= (extraBytesToRead+1); /* return to the illegal value itself */
+		    result = sourceIllegal;
+		    break;
+		} else {
+		    *target++ = UNI_REPLACEMENT_CHAR;
+		}
+	    } else {
+		*target++ = (UTF16)ch; /* normal case */
+	    }
+	} else if (ch > UNI_MAX_UTF16) {
+	    if (flags == strictConversion) {
+		result = sourceIllegal;
+		source -= (extraBytesToRead+1); /* return to the start */
+		break; /* Bail out; shouldn't continue */
+	    } else {
+		*target++ = UNI_REPLACEMENT_CHAR;
+	    }
+	} else {
+	    /* target is a character in range 0xFFFF - 0x10FFFF. */
+	    if (target + 1 >= targetEnd) {
+		source -= (extraBytesToRead+1); /* Back up source pointer! */
+		result = targetExhausted; break;
+	    }
+	    ch -= halfBase;
+	    *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
+	    *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
+	}
+    }
+    *sourceStart = source;
+    *targetStart = target;
+    return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF32toUTF8 (
+	const UTF32** sourceStart, const UTF32* sourceEnd, 
+	UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
+    ConversionResult result = conversionOK;
+    const UTF32* source = *sourceStart;
+    UTF8* target = *targetStart;
+    while (source < sourceEnd) {
+	UTF32 ch;
+	unsigned short bytesToWrite = 0;
+	const UTF32 byteMask = 0xBF;
+	const UTF32 byteMark = 0x80; 
+	ch = *source++;
+	if (flags == strictConversion ) {
+	    /* UTF-16 surrogate values are illegal in UTF-32 */
+	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+		--source; /* return to the illegal value itself */
+		result = sourceIllegal;
+		break;
+	    }
+	}
+	/*
+	 * Figure out how many bytes the result will require. Turn any
+	 * illegally large UTF32 things (> Plane 17) into replacement chars.
+	 */
+	if (ch < (UTF32)0x80) {	     bytesToWrite = 1;
+	} else if (ch < (UTF32)0x800) {     bytesToWrite = 2;
+	} else if (ch < (UTF32)0x10000) {   bytesToWrite = 3;
+	} else if (ch <= UNI_MAX_LEGAL_UTF32) {  bytesToWrite = 4;
+	} else {			    bytesToWrite = 3;
+					    ch = UNI_REPLACEMENT_CHAR;
+					    result = sourceIllegal;
+	}
+	
+	target += bytesToWrite;
+	if (target > targetEnd) {
+	    --source; /* Back up source pointer! */
+	    target -= bytesToWrite; result = targetExhausted; break;
+	}
+	switch (bytesToWrite) { /* note: everything falls through. */
+	    case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+	    case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+	    case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+	    case 1: *--target = (UTF8) (ch | firstByteMark[bytesToWrite]);
+	}
+	target += bytesToWrite;
+    }
+    *sourceStart = source;
+    *targetStart = target;
+    return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF8toUTF32 (
+	const UTF8** sourceStart, const UTF8* sourceEnd, 
+	UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
+    ConversionResult result = conversionOK;
+    const UTF8* source = *sourceStart;
+    UTF32* target = *targetStart;
+    while (source < sourceEnd) {
+	UTF32 ch = 0;
+	unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+	if (source + extraBytesToRead >= sourceEnd) {
+	    result = sourceExhausted; break;
+	}
+	/* Do this check whether lenient or strict */
+	if (! isLegalUTF8(source, extraBytesToRead+1)) {
+	    result = sourceIllegal;
+	    break;
+	}
+	/*
+	 * The cases all fall through. See "Note A" below.
+	 */
+	switch (extraBytesToRead) {
+	    case 5: ch += *source++; ch <<= 6;
+	    case 4: ch += *source++; ch <<= 6;
+	    case 3: ch += *source++; ch <<= 6;
+	    case 2: ch += *source++; ch <<= 6;
+	    case 1: ch += *source++; ch <<= 6;
+	    case 0: ch += *source++;
+	}
+	ch -= offsetsFromUTF8[extraBytesToRead];
+
+	if (target >= targetEnd) {
+	    source -= (extraBytesToRead+1); /* Back up the source pointer! */
+	    result = targetExhausted; break;
+	}
+	if (ch <= UNI_MAX_LEGAL_UTF32) {
+	    /*
+	     * UTF-16 surrogate values are illegal in UTF-32, and anything
+	     * over Plane 17 (> 0x10FFFF) is illegal.
+	     */
+	    if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+		if (flags == strictConversion) {
+		    source -= (extraBytesToRead+1); /* return to the illegal value itself */
+		    result = sourceIllegal;
+		    break;
+		} else {
+		    *target++ = UNI_REPLACEMENT_CHAR;
+		}
+	    } else {
+		*target++ = ch;
+	    }
+	} else { /* i.e., ch > UNI_MAX_LEGAL_UTF32 */
+	    result = sourceIllegal;
+	    *target++ = UNI_REPLACEMENT_CHAR;
+	}
+    }
+    *sourceStart = source;
+    *targetStart = target;
+    return result;
+}
+
+/* ---------------------------------------------------------------------
+
+    Note A.
+    The fall-through switches in UTF-8 reading code save a
+    temp variable, some decrements & conditionals.  The switches
+    are equivalent to the following loop:
+	{
+	    int tmpBytesToRead = extraBytesToRead+1;
+	    do {
+		ch += *source++;
+		--tmpBytesToRead;
+		if (tmpBytesToRead) ch <<= 6;
+	    } while (tmpBytesToRead > 0);
+	}
+    In UTF-8 writing code, the switches on "bytesToWrite" are
+    similarly unrolled loops.
+
+   --------------------------------------------------------------------- */
+}
diff --git a/cppe/src/IceE/ConvertUTF.h b/cppe/src/IceE/ConvertUTF.h
new file mode 100755
index 00000000000..326f14354e2
--- /dev/null
+++ b/cppe/src/IceE/ConvertUTF.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ * 
+ * Disclaimer
+ * 
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ * 
+ * Limitations on Rights to Redistribute This Code
+ * 
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+// **********************************************************************
+//
+// Copyright (c) 2006 ZeroC, Inc. All rights reserved.
+//
+// This file was slightly modified to move the definitions to the
+// IceUtil namespace and use C++ types.
+//
+// **********************************************************************
+
+#ifndef ICEE_CONVERT_UTF_H
+#define ICEE_CONVERT_UTF_H
+
+#include <IceE/Unicode.h>
+
+
+/* ---------------------------------------------------------------------
+
+    Conversions between UTF32, UTF-16, and UTF-8.  Header file.
+
+    Several funtions are included here, forming a complete set of
+    conversions between the three formats.  UTF-7 is not included
+    here, but is handled in a separate source file.
+
+    Each of these routines takes pointers to input buffers and output
+    buffers.  The input buffers are const.
+
+    Each routine converts the text between *sourceStart and sourceEnd,
+    putting the result into the buffer between *targetStart and
+    targetEnd. Note: the end pointers are *after* the last item: e.g. 
+    *(sourceEnd - 1) is the last item.
+
+    The return result indicates whether the conversion was successful,
+    and if not, whether the problem was in the source or target buffers.
+    (Only the first encountered problem is indicated.)
+
+    After the conversion, *sourceStart and *targetStart are both
+    updated to point to the end of last text successfully converted in
+    the respective buffers.
+
+    Input parameters:
+	sourceStart - pointer to a pointer to the source buffer.
+		The contents of this are modified on return so that
+		it points at the next thing to be converted.
+	targetStart - similarly, pointer to pointer to the target buffer.
+	sourceEnd, targetEnd - respectively pointers to the ends of the
+		two buffers, for overflow checking only.
+
+    These conversion functions take a ConversionFlags argument. When this
+    flag is set to strict, both irregular sequences and isolated surrogates
+    will cause an error.  When the flag is set to lenient, both irregular
+    sequences and isolated surrogates are converted.
+
+    Whether the flag is strict or lenient, all illegal sequences will cause
+    an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
+    or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
+    must check for illegal sequences.
+
+    When the flag is set to lenient, characters over 0x10FFFF are converted
+    to the replacement character; otherwise (when the flag is set to strict)
+    they constitute an error.
+
+    Output parameters:
+	The value "sourceIllegal" is returned from some routines if the input
+	sequence is malformed.  When "sourceIllegal" is returned, the source
+	value will point to the illegal value that caused the problem. E.g.,
+	in UTF-8 when a sequence is malformed, it points to the start of the
+	malformed sequence.  
+
+    Author: Mark E. Davis, 1994.
+    Rev History: Rick McGowan, fixes & updates May 2001.
+		 Fixes & updates, Sept 2001.
+
+------------------------------------------------------------------------ */
+
+/* ---------------------------------------------------------------------
+    The following 4 definitions are compiler-specific.
+    The C standard does not guarantee that wchar_t has at least
+    16 bits, so wchar_t is no less portable than unsigned short!
+    All should be unsigned values to avoid sign extension during
+    bit mask & shift operations.
+------------------------------------------------------------------------ */
+
+namespace IceUtil
+{
+
+typedef unsigned int	UTF32;	/* at least 32 bits */
+typedef unsigned short	UTF16;	/* at least 16 bits */
+typedef unsigned char	UTF8;	/* typically 8 bits */
+typedef bool	        Boolean; /* 0 or 1 */
+
+/* Some fundamental constants */
+#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
+#define UNI_MAX_BMP (UTF32)0x0000FFFF
+#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
+#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
+#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
+
+
+ConversionResult ConvertUTF8toUTF16(
+    const UTF8** sourceStart, const UTF8* sourceEnd, 
+    UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
+
+ConversionResult ConvertUTF16toUTF8 (
+    const UTF16** sourceStart, const UTF16* sourceEnd, 
+    UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
+		
+ConversionResult ConvertUTF8toUTF32(
+    const UTF8** sourceStart, const UTF8* sourceEnd, 
+    UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
+
+ConversionResult ConvertUTF32toUTF8(
+    const UTF32** sourceStart, const UTF32* sourceEnd, 
+    UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
+
+//
+// isLegalUTFSequence is declared in IceUtil/Unicode.h
+//
+
+/* --------------------------------------------------------------------- */
+
+}
+#endif
diff --git a/cppe/src/IceE/Makefile b/cppe/src/IceE/Makefile
index 69cf9ec7e5a..f56710da0b1 100644
--- a/cppe/src/IceE/Makefile
+++ b/cppe/src/IceE/Makefile
@@ -32,6 +32,7 @@ LOCAL_OBJS	= BasicStream.o \
 		  Communicator.o \
 		  Cond.o \
 		  Connection.o \
+		  ConvertUTF.o \
 		  Current.o \
 		  DefaultsAndOverrides.o \
 		  Endpoint.o \
@@ -84,6 +85,7 @@ LOCAL_OBJS	= BasicStream.o \
 		  TraceLevels.o \
 		  TraceUtil.o \
 		  UnknownEndpoint.o \
+		  Unicode.o \
 		  UUID.o
 
 OBJS		= $(LOCAL_OBJS) $(TRANSPORT_OBJS)
diff --git a/cppe/src/IceE/Unicode.cpp b/cppe/src/IceE/Unicode.cpp
new file mode 100644
index 00000000000..a4bc29fadc6
--- /dev/null
+++ b/cppe/src/IceE/Unicode.cpp
@@ -0,0 +1,270 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice-E is licensed to you under the terms described in the
+// ICEE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceE/Unicode.h>
+#include <IceE/ConvertUTF.h>
+
+using namespace std;
+using namespace IceUtil;
+
+namespace
+{
+//
+// Helper class, base never defined
+// Usage: WstringHelper<sizeof(wchar_t)>::toUTF8 and fromUTF8.
+//
+template<size_t wcharSize> 
+struct WstringHelper
+{
+    static ConversionResult toUTF8(
+	const wchar_t*& sourceStart, const wchar_t* sourceEnd, 
+	Byte*& targetStart, Byte* targetEnd, ConversionFlags flags);
+
+    static ConversionResult fromUTF8(
+	const Byte*& sourceStart, const Byte* sourceEnd, 
+	wchar_t*& targetStart, wchar_t* targetEnd, ConversionFlags flags);
+};
+
+template<>
+struct WstringHelper<2>
+{
+    static ConversionResult toUTF8(
+	const wchar_t*& sourceStart, const wchar_t* sourceEnd, 
+	Byte*& targetStart, Byte* targetEnd, ConversionFlags flags)
+    {
+	return ConvertUTF16toUTF8(
+	    reinterpret_cast<const UTF16**>(&sourceStart),
+	    reinterpret_cast<const UTF16*>(sourceEnd),
+	    &targetStart, targetEnd, flags);
+    }
+    
+    static ConversionResult fromUTF8(
+	const Byte*& sourceStart, const Byte* sourceEnd, 
+	wchar_t*& targetStart, wchar_t* targetEnd, ConversionFlags flags)
+    {
+	return ConvertUTF8toUTF16(
+	    &sourceStart, sourceEnd,
+	    reinterpret_cast<UTF16**>(&targetStart),
+	    reinterpret_cast<UTF16*>(targetEnd), flags);
+    }
+};
+
+template<>
+struct WstringHelper<4>
+{
+    static ConversionResult toUTF8(
+	const wchar_t*& sourceStart, const wchar_t* sourceEnd, 
+	Byte*& targetStart, Byte* targetEnd, ConversionFlags flags)
+    {
+	return ConvertUTF32toUTF8(
+	    reinterpret_cast<const UTF32**>(&sourceStart),
+	    reinterpret_cast<const UTF32*>(sourceEnd),
+	    &targetStart, targetEnd, flags);
+    }
+    
+    static ConversionResult fromUTF8(
+	const Byte*& sourceStart, const Byte* sourceEnd, 
+	wchar_t*& targetStart, wchar_t* targetEnd, ConversionFlags flags)
+    {
+	return ConvertUTF8toUTF32(
+	    &sourceStart, sourceEnd,
+	    reinterpret_cast<UTF32**>(&targetStart),
+	    reinterpret_cast<UTF32*>(targetEnd), flags);
+    }
+};
+}
+
+//
+// convertXXX functions
+//
+
+ConversionResult 
+IceUtil::convertUTFWstringToUTF8(
+    const wchar_t*& sourceStart, const wchar_t* sourceEnd, 
+    Byte*& targetStart, Byte* targetEnd, ConversionFlags flags)
+{
+    return WstringHelper<sizeof(wchar_t)>::toUTF8(
+	sourceStart, sourceEnd, targetStart, targetEnd, flags);
+}
+
+ConversionResult
+IceUtil::convertUTF8ToUTFWstring(
+    const Byte*& sourceStart, const Byte* sourceEnd, 
+    wchar_t*& targetStart, wchar_t* targetEnd, ConversionFlags flags)
+{
+    return WstringHelper<sizeof(wchar_t)>::fromUTF8(
+	sourceStart, sourceEnd, targetStart, targetEnd, flags);
+}
+
+ConversionResult 
+IceUtil::convertUTF8ToUTFWstring(const Byte*& sourceStart, const Byte* sourceEnd, 
+				 std::wstring& target, ConversionFlags flags)
+{
+    //
+    // Could be reimplemented without this temporary wchar_t buffer
+    //
+    size_t size = static_cast<size_t>(sourceEnd - sourceStart);
+    wchar_t* outBuf = new wchar_t[size];
+    wchar_t* targetStart = outBuf; 
+    wchar_t* targetEnd = targetStart + size;
+
+    ConversionResult result =  
+	convertUTF8ToUTFWstring(sourceStart, sourceEnd, targetStart,
+				targetEnd, flags);
+
+    if(result == conversionOK)
+    {
+	std::wstring s(outBuf, static_cast<size_t>(targetStart - outBuf));
+	s.swap(target);
+    }
+    delete[] outBuf;
+    return result;
+}
+
+
+//
+// wstringToString and stringToWstring
+//
+
+const char* IceUtil::UTFConversionException::_name = "IceUtil::UTFConversionException";
+
+IceUtil::UTFConversionException::UTFConversionException(const char* file, int line, 
+							ConversionResult cr): 
+    Exception(file, line),
+    _conversionResult(cr)
+{}
+
+const string
+IceUtil::UTFConversionException::ice_name() const
+{
+    return _name;
+}
+
+string
+IceUtil::UTFConversionException::toString() const
+{
+    string str = Exception::toString();
+    switch(_conversionResult)
+    {
+	case sourceExhausted:
+	    str += ": source exhausted";
+	    break;
+	case targetExhausted:
+	    str += ": target exhausted";
+	    break;
+	case sourceIllegal:
+	    str += ": illegal source";
+	    break;
+	default:
+	    assert(0);
+	    break;
+    };
+    return str;
+}
+
+IceUtil::Exception*
+IceUtil::UTFConversionException::ice_clone() const
+{
+    return new UTFConversionException(*this);
+}
+
+void
+IceUtil::UTFConversionException::ice_throw() const
+{
+    throw *this;
+}
+
+IceUtil::ConversionResult
+IceUtil::UTFConversionException::conversionResult() const
+{
+    return _conversionResult;
+}
+
+
+string
+IceUtil::wstringToString(const wstring& wstr)
+{
+    string target;
+    
+    size_t size = wstr.size() * 3 * (sizeof(wchar_t) / 2);
+
+    Byte* outBuf = new Byte[size];
+    Byte* targetStart = outBuf; 
+    Byte* targetEnd = outBuf + size;
+
+    const wchar_t* sourceStart = wstr.data();
+  
+    ConversionResult cr = 
+	convertUTFWstringToUTF8(
+	    sourceStart, sourceStart + wstr.size(), 
+	    targetStart, targetEnd, lenientConversion);
+	
+    if(cr != conversionOK)
+    {
+	delete[] outBuf;
+	throw UTFConversionException(__FILE__, __LINE__, cr);
+    }
+    
+    string s(reinterpret_cast<char*>(outBuf),
+	     static_cast<size_t>(targetStart - outBuf));
+    s.swap(target);
+    delete[] outBuf;
+    return target;
+}
+
+wstring
+IceUtil::stringToWstring(const string& str)
+{
+    wstring result;
+    const Byte* sourceStart = reinterpret_cast<const Byte*>(str.data());
+    
+    ConversionResult cr 
+	= convertUTF8ToUTFWstring(sourceStart, sourceStart + str.size(),
+				  result, lenientConversion);
+
+    if(cr != conversionOK)
+    {
+	throw UTFConversionException(__FILE__, __LINE__, cr);
+    }
+    return result;
+}
+
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+//
+// See comments in IceUtil/Unicode.h
+//
+
+#   if _MSC_VER < 1400
+string
+IceUtil::wstringToString(const basic_string<__wchar_t>& str)
+{
+    return wstringToString(*reinterpret_cast<const wstring*>(&str));
+}
+
+basic_string<__wchar_t>
+IceUtil::stringToNativeWstring(const string& str)
+{
+    return reinterpret_cast<basic_string<__wchar_t>& >(stringToWstring(str));
+}
+#   else
+string
+IceUtil::wstringToString(const basic_string<unsigned short>& str)
+{
+    return wstringToString(*reinterpret_cast<const wstring*>(&str));
+}
+
+basic_string<unsigned short>
+IceUtil::stringToTypedefWstring(const string& str)
+{
+    return reinterpret_cast<basic_string<unsigned short>& >(stringToWstring(str));
+}
+
+#   endif
+#endif
diff --git a/cppe/src/IceE/ice.dsp b/cppe/src/IceE/ice.dsp
index 8f4fc593f7d..a62316a30ee 100755
--- a/cppe/src/IceE/ice.dsp
+++ b/cppe/src/IceE/ice.dsp
@@ -116,8 +116,8 @@ PostBuild_Cmds=copy $(OutDir)\iceed.lib ..\..\lib\	copy $(OutDir)\icee11d.pdb ..
 # PROP Intermediate_Dir "ReleaseStatic"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-MTL=midl.exe
 SLICE2CPPEFLAGS=-DICEE
+MTL=midl.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /c
 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /c
@@ -133,7 +133,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool
 OutDir=.\ReleaseStatic
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy                                        $(OutDir)\icee.lib                                        ..\..\lib\ 
+PostBuild_Cmds=copy                                         $(OutDir)\icee.lib                                         ..\..\lib\ 
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "ice - Win32 Debug Static"
@@ -149,8 +149,8 @@ PostBuild_Cmds=copy                                        $(OutDir)\icee.lib
 # PROP Intermediate_Dir "DebugStatic"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-MTL=midl.exe
 SLICE2CPPEFLAGS=-DICEE
+MTL=midl.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c
@@ -166,7 +166,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool
 OutDir=.\DebugStatic
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy                                       $(OutDir)\iceed.lib                                       ..\..\lib\ 
+PostBuild_Cmds=copy                                        $(OutDir)\iceed.lib                                        ..\..\lib\ 
 # End Special Build Tool
 
 !ENDIF 
@@ -214,6 +214,10 @@ SOURCE=..\TcpTransport\Connector.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\ConvertUTF.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\Current.cpp
 # End Source File
 # Begin Source File
@@ -326,6 +330,10 @@ SOURCE=.\Properties.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\Protocol.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\Proxy.cpp
 # End Source File
 # Begin Source File
@@ -410,6 +418,10 @@ SOURCE=..\TcpTransport\Transceiver.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\Unicode.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\UnknownEndpoint.cpp
 # End Source File
 # Begin Source File
@@ -438,6 +450,10 @@ SOURCE=..\..\include\IceE\BuiltinSequences.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\ConvertUTF.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\IceE\Current.h
 # End Source File
 # Begin Source File
@@ -610,6 +626,10 @@ SOURCE=..\..\include\IceE\UndefSysMacros.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\IceE\Unicode.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\IceE\UUID.h
 # End Source File
 # End Group
diff --git a/cppe/src/IceE/ice.vcp b/cppe/src/IceE/ice.vcp
index ed1c03697d4..48f87584924 100755
--- a/cppe/src/IceE/ice.vcp
+++ b/cppe/src/IceE/ice.vcp
@@ -2498,6 +2498,101 @@ DEP_CPP_CONNEC=\
 # End Source File
 # Begin Source File
 
+SOURCE=.\ConvertUTF.cpp
+
+!IF  "$(CFG)" == "ice - Win32 (WCE emulator) Release"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Debug"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\Current.cpp
 
 !IF  "$(CFG)" == "ice - Win32 (WCE emulator) Release"
@@ -9114,6 +9209,69 @@ DEP_CPP_PROPE=\
 # End Source File
 # Begin Source File
 
+SOURCE=.\Protocol.cpp
+
+!IF  "$(CFG)" == "ice - Win32 (WCE emulator) Release"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Debug"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\Proxy.cpp
 
 !IF  "$(CFG)" == "ice - Win32 (WCE emulator) Release"
@@ -13911,6 +14069,101 @@ DEP_CPP_TRANS=\
 # End Source File
 # Begin Source File
 
+SOURCE=.\Unicode.cpp
+
+!IF  "$(CFG)" == "ice - Win32 (WCE emulator) Release"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Debug"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "ice - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	".\ConvertUTF.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\UnknownEndpoint.cpp
 
 !IF  "$(CFG)" == "ice - Win32 (WCE emulator) Release"
@@ -14385,6 +14638,10 @@ SOURCE=..\..\include\IceE\ConnectorF.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\ConvertUTF.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\IceE\Current.h
 # End Source File
 # Begin Source File
@@ -14741,6 +14998,10 @@ SOURCE=..\..\include\IceE\UndefSysMacros.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\IceE\Unicode.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\IceE\UserExceptionFactory.h
 # End Source File
 # Begin Source File
diff --git a/cppe/src/IceE/ice_CE.vcproj b/cppe/src/IceE/ice_CE.vcproj
index 5890340f838..903f0ed69f4 100755
--- a/cppe/src/IceE/ice_CE.vcproj
+++ b/cppe/src/IceE/ice_CE.vcproj
@@ -1362,6 +1362,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\ConvertUTF.cpp"
+				>
+			</File>
+			<File
 				RelativePath="Current.cpp"
 				>
 				<FileConfiguration
@@ -3434,6 +3438,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\Protocol.cpp"
+				>
+			</File>
+			<File
 				RelativePath="Proxy.cpp"
 				>
 				<FileConfiguration
@@ -5181,11 +5189,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IceUtil\Config.h"
+				RelativePath="..\..\include\IceE\Config.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IceE\Config.h"
+				RelativePath="..\..\include\IceUtil\Config.h"
 				>
 			</File>
 			<File
@@ -5205,6 +5213,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\ConvertUTF.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\IceE\Current.h"
 				>
 			</File>
@@ -5233,11 +5245,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IceUtil\Exception.h"
+				RelativePath="..\..\include\IceE\Exception.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IceE\Exception.h"
+				RelativePath="..\..\include\IceUtil\Exception.h"
 				>
 			</File>
 			<File
@@ -5253,19 +5265,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IceUtil\Functional.h"
+				RelativePath="..\..\include\IceE\Functional.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IceE\Functional.h"
+				RelativePath="..\..\include\IceUtil\Functional.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IceUtil\Handle.h"
+				RelativePath="..\..\include\IceE\Handle.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\IceE\Handle.h"
+				RelativePath="..\..\include\IceUtil\Handle.h"
 				>
 			</File>
 			<File
@@ -5561,6 +5573,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\Unicode.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\IceE\UserExceptionFactory.h"
 				>
 			</File>
diff --git a/cppe/src/IceEC/Makefile b/cppe/src/IceEC/Makefile
index 3c2ca431119..7ac24f3f3b0 100644
--- a/cppe/src/IceEC/Makefile
+++ b/cppe/src/IceEC/Makefile
@@ -29,6 +29,7 @@ ICE_OBJS	= BasicStream.o \
 		  Communicator.o \
 		  Cond.o \
 		  Connection.o \
+		  ConvertUTF.o \
 		  DefaultsAndOverrides.o \
 		  Endpoint.o \
 		  ExceptionBase.o \
@@ -66,6 +67,7 @@ ICE_OBJS	= BasicStream.o \
 		  TraceLevels.o \
 		  TraceUtil.o \
 		  UnknownEndpoint.o \
+		  Unicode.o \
 		  UUID.o
 
 LOCAL_OBJS	= BuiltinSequences.o \
diff --git a/cppe/src/IceEC/icec.dsp b/cppe/src/IceEC/icec.dsp
index d8274e3cc21..7793f6dc325 100755
--- a/cppe/src/IceEC/icec.dsp
+++ b/cppe/src/IceEC/icec.dsp
@@ -116,8 +116,8 @@ PostBuild_Cmds=copy $(OutDir)\iceecd.lib ..\..\lib\	copy $(OutDir)\iceec11d.pdb
 # PROP Intermediate_Dir "ReleaseStatic"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-MTL=midl.exe
 SLICE2CPPEFLAGS=-DICEE
+MTL=midl.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /c
 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c
@@ -133,7 +133,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool
 OutDir=.\ReleaseStatic
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy                                              $(OutDir)\iceec.lib                                              ..\..\lib\ 
+PostBuild_Cmds=copy                                               $(OutDir)\iceec.lib                                               ..\..\lib\ 
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "icec - Win32 Debug Static"
@@ -149,8 +149,8 @@ PostBuild_Cmds=copy                                              $(OutDir)\iceec
 # PROP Intermediate_Dir "DebugStatic"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-MTL=midl.exe
 SLICE2CPPEFLAGS=-DICEE
+MTL=midl.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /GZ /c
 # ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c
@@ -166,7 +166,7 @@ LIB32=link.exe -lib
 # Begin Special Build Tool
 OutDir=.\DebugStatic
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy                                             $(OutDir)\iceecd.lib                                             ..\..\lib\ 
+PostBuild_Cmds=copy                                              $(OutDir)\iceecd.lib                                              ..\..\lib\ 
 # End Special Build Tool
 
 !ENDIF 
@@ -210,6 +210,10 @@ SOURCE=..\TcpTransport\Connector.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\IceE\ConvertUTF.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\IceE\DefaultsAndOverrides.cpp
 # End Source File
 # Begin Source File
@@ -298,6 +302,10 @@ SOURCE=..\IceE\Properties.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\IceE\Protocol.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\IceE\Proxy.cpp
 # End Source File
 # Begin Source File
@@ -378,6 +386,10 @@ SOURCE=..\TcpTransport\Transceiver.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\IceE\Unicode.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\IceE\UnknownEndpoint.cpp
 # End Source File
 # Begin Source File
@@ -446,6 +458,10 @@ SOURCE=..\..\include\IceE\ConnectorF.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\IceE\ConvertUTF.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\IceE\DefaultsAndOverrides.h
 # End Source File
 # Begin Source File
@@ -734,6 +750,10 @@ SOURCE=..\..\include\IceE\TransceiverF.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\IceE\Unicode.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\IceE\UserExceptionFactory.h
 # End Source File
 # Begin Source File
diff --git a/cppe/src/IceEC/icec.vcp b/cppe/src/IceEC/icec.vcp
index 0d5e5afd1c5..b85027fcf29 100755
--- a/cppe/src/IceEC/icec.vcp
+++ b/cppe/src/IceEC/icec.vcp
@@ -4370,6 +4370,101 @@ NODEP_CPP_CONNEC=\
 # End Source File
 # Begin Source File
 
+SOURCE=..\IceE\ConvertUTF.cpp
+
+!IF  "$(CFG)" == "icec - Win32 (WCE emulator) Release"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Debug"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_CONVE=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\IceE\DefaultsAndOverrides.cpp
 
 !IF  "$(CFG)" == "icec - Win32 (WCE emulator) Release"
@@ -15113,6 +15208,69 @@ DEP_CPP_PROPE=\
 # End Source File
 # Begin Source File
 
+SOURCE=..\IceE\Protocol.cpp
+
+!IF  "$(CFG)" == "icec - Win32 (WCE emulator) Release"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Debug"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_PROTO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Protocol.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\IceE\Proxy.cpp
 
 !IF  "$(CFG)" == "icec - Win32 (WCE emulator) Release"
@@ -25310,6 +25468,101 @@ NODEP_CPP_TRANS=\
 # End Source File
 # Begin Source File
 
+SOURCE=..\IceE\Unicode.cpp
+
+!IF  "$(CFG)" == "icec - Win32 (WCE emulator) Release"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Debug"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ELSEIF  "$(CFG)" == "icec - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_UNICO=\
+	"..\..\include\IceE\Config.h"\
+	"..\..\include\IceE\Exception.h"\
+	"..\..\include\IceE\ExceptionBase.h"\
+	"..\..\include\IceE\Handle.h"\
+	"..\..\include\IceE\Unicode.h"\
+	"..\IceE\ConvertUTF.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\IceE\UnknownEndpoint.cpp
 
 !IF  "$(CFG)" == "icec - Win32 (WCE emulator) Release"
@@ -26343,6 +26596,10 @@ SOURCE=..\..\include\IceE\ConnectorF.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\IceE\ConvertUTF.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\IceE\Current.h
 # End Source File
 # Begin Source File
@@ -26647,6 +26904,10 @@ SOURCE=..\..\include\IceE\UndefSysMacros.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\IceE\Unicode.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\IceE\UserExceptionFactory.h
 # End Source File
 # Begin Source File
diff --git a/cppe/src/IceEC/icec_CE.vcproj b/cppe/src/IceEC/icec_CE.vcproj
index 30489be5ac4..d87f19f3ae7 100755
--- a/cppe/src/IceEC/icec_CE.vcproj
+++ b/cppe/src/IceEC/icec_CE.vcproj
@@ -1288,6 +1288,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\IceE\ConvertUTF.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\IceE\DefaultsAndOverrides.cpp"
 				>
 				<FileConfiguration
@@ -2916,6 +2920,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\IceE\Protocol.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\IceE\Proxy.cpp"
 				>
 				<FileConfiguration
@@ -4396,6 +4404,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\IceE\Unicode.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\IceE\UnknownEndpoint.cpp"
 				>
 				<FileConfiguration
@@ -4605,6 +4617,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\IceE\ConvertUTF.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\IceE\Current.h"
 				>
 			</File>
@@ -4909,6 +4925,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\include\IceE\Unicode.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\IceE\UserExceptionFactory.h"
 				>
 			</File>
diff --git a/cppe/test/IceE/custom/AllTests.cpp b/cppe/test/IceE/custom/AllTests.cpp
index 2be38d79b44..94e57af2af1 100644
--- a/cppe/test/IceE/custom/AllTests.cpp
+++ b/cppe/test/IceE/custom/AllTests.cpp
@@ -11,6 +11,7 @@
 #include <IceE/Locator.h>
 #include <TestCommon.h>
 #include <Test.h>
+#include <Wstring.h>
 
 using namespace std;
 
@@ -460,5 +461,77 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     tprintf("ok\n");
 
+    tprintf("testing wstring... ");
+
+    Test1::WstringSeq wseq1;
+    wseq1.push_back(L"Wide String");
+
+    Test2::WstringSeq wseq2;
+    wseq2 = wseq1;
+
+    Test1::WstringWStringDict wdict1;
+    wdict1[L"Key"] = L"Value";
+
+    Test2::WstringWStringDict wdict2;
+    wdict2 = wdict1;
+
+    ref = communicator->getProperties()->getPropertyWithDefault(
+        "Custom.WstringProxy1", "wstring1:default -p 12010 -t 10000");
+    base = communicator->stringToProxy(ref);
+    test(base);
+    Test1::WstringClassPrx wsc1 = Test1::WstringClassPrx::checkedCast(base);
+    test(t);
+
+    ref = communicator->getProperties()->getPropertyWithDefault(
+        "Custom.WstringProxy2", "wstring2:default -p 12010 -t 10000");
+    base = communicator->stringToProxy(ref);
+    test(base);
+    Test2::WstringClassPrx wsc2 = Test2::WstringClassPrx::checkedCast(base);
+    test(t);
+
+    wstring wstr = L"A Wide String";
+    wstring out;
+    wstring ret = wsc1->opString(wstr, out);
+    test(out == wstr);
+    test(ret == wstr);
+
+    ret = wsc2->opString(wstr, out);
+    test(out == wstr);
+    test(ret == wstr);
+
+    Test1::WstringStruct wss1;
+    wss1.s = wstr;
+    Test1::WstringStruct wss1out;
+    Test1::WstringStruct wss1ret = wsc1->opStruct(wss1, wss1out);
+    test(wss1out == wss1);
+    test(wss1ret == wss1);
+
+    Test2::WstringStruct wss2;
+    wss2.s = wstr;
+    Test2::WstringStruct wss2out;
+    Test2::WstringStruct wss2ret = wsc2->opStruct(wss2, wss2out);
+    test(wss2out == wss2);
+    test(wss2ret == wss2);
+
+    try
+    {
+        wsc1->throwExcept(wstr);
+    }
+    catch(const Test1::WstringException& ex)
+    {
+        test(ex.reason == wstr);
+    }
+
+    try
+    {
+        wsc2->throwExcept(wstr);
+    }
+    catch(const Test2::WstringException& ex)
+    {
+        test(ex.reason == wstr);
+    }
+
+    tprintf("ok\n");
+
     return t;
 }
diff --git a/cppe/test/IceE/custom/Collocated.cpp b/cppe/test/IceE/custom/Collocated.cpp
index da213107c0f..c3582f2925f 100644
--- a/cppe/test/IceE/custom/Collocated.cpp
+++ b/cppe/test/IceE/custom/Collocated.cpp
@@ -11,6 +11,7 @@
 #include <TestCommon.h>
 #include <TestApplication.h>
 #include <TestI.h>
+#include <WstringI.h>
 
 using namespace std;
 
@@ -37,6 +38,8 @@ public:
 
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         adapter->add(new TestIntfI(communicator()), Ice::stringToIdentity("test"));
+	adapter->add(new Test1::WstringClassI, Ice::stringToIdentity("wstring1"));
+	adapter->add(new Test2::WstringClassI, Ice::stringToIdentity("wstring2"));
         adapter->activate();
 
         Test::TestIntfPrx allTests(const Ice::CommunicatorPtr&);
diff --git a/cppe/test/IceE/custom/Makefile b/cppe/test/IceE/custom/Makefile
index 503195f17f5..bb9b1ec76dc 100644
--- a/cppe/test/IceE/custom/Makefile
+++ b/cppe/test/IceE/custom/Makefile
@@ -16,17 +16,22 @@ COLLOCATED	= collocated
 TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
 
 COBJS		= Test.o \
+		  Wstring.o \
 		  Client.o \
 		  AllTests.o \
 		  MyByteSeq.o
 
 SOBJS		= Test.o \
 		  TestI.o \
+		  Wstring.o \
+		  WstringI.o \
 		  Server.o \
 		  MyByteSeq.o
 
 COLOBJS		= Test.o \
 		  TestI.o \
+		  Wstring.o \
+		  WstringI.o \
 		  Collocated.o \
 		  AllTests.o \
 		  MyByteSeq.o
@@ -35,7 +40,7 @@ SRCS		= $(COBJS:.o=.cpp) \
 		  $(SOBJS:.o=.cpp) \
 		  $(COLOBJS:.o=.cpp)
 
-SLICE_SRCS	= Test.ice
+SLICE_SRCS	= Test.ice Wstring.ice
 
 include $(top_srcdir)/config/Make.rules
 
diff --git a/cppe/test/IceE/custom/Server.cpp b/cppe/test/IceE/custom/Server.cpp
index 645d609c3c2..b564ea0543e 100644
--- a/cppe/test/IceE/custom/Server.cpp
+++ b/cppe/test/IceE/custom/Server.cpp
@@ -11,6 +11,7 @@
 #include <TestCommon.h>
 #include <TestApplication.h>
 #include <TestI.h>
+#include <WstringI.h>
 
 using namespace std;
 
@@ -37,6 +38,8 @@ public:
 	
         Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
         adapter->add(new TestIntfI(communicator()), Ice::stringToIdentity("test"));
+	adapter->add(new Test1::WstringClassI, Ice::stringToIdentity("wstring1"));
+	adapter->add(new Test2::WstringClassI, Ice::stringToIdentity("wstring2"));
 	adapter->activate();
 
 #ifndef _WIN32_WCE
diff --git a/cppe/test/IceE/custom/Wstring.ice b/cppe/test/IceE/custom/Wstring.ice
new file mode 100644
index 00000000000..869475cec09
--- /dev/null
+++ b/cppe/test/IceE/custom/Wstring.ice
@@ -0,0 +1,75 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef WSTRING_ICE
+#define WSTRING_ICE
+
+["cpp:type:wstring"] module Test1
+{
+
+sequence<string> WstringSeq;
+
+dictionary<string, string> WstringWStringDict;
+
+struct WstringStruct
+{
+    string s;
+};
+
+exception WstringException
+{
+    string reason;
+};
+
+class WstringClass
+{
+    string opString(string s1, out string s2);
+
+    WstringStruct opStruct(WstringStruct s1, out WstringStruct s2);
+
+    void throwExcept(string reason)
+        throws WstringException;
+
+    string s;
+};
+
+};
+
+module Test2
+{
+
+sequence<["cpp:type:wstring"] string> WstringSeq;
+
+dictionary<["cpp:type:wstring"] string, ["cpp:type:wstring"] string> WstringWStringDict;
+
+["cpp:type:wstring"] struct WstringStruct
+{
+    string s;
+};
+
+["cpp:type:wstring"] exception WstringException
+{
+    string reason;
+};
+
+["cpp:type:wstring"] class WstringClass
+{
+    string opString(string s1, out string s2);
+
+    WstringStruct opStruct(WstringStruct s1, out WstringStruct s2);
+
+    void throwExcept(string reason)
+        throws WstringException;
+
+    string s;
+};
+
+};
+
+#endif
diff --git a/cppe/test/IceE/custom/WstringI.cpp b/cppe/test/IceE/custom/WstringI.cpp
new file mode 100644
index 00000000000..acda01c8d7a
--- /dev/null
+++ b/cppe/test/IceE/custom/WstringI.cpp
@@ -0,0 +1,64 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <WstringI.h>
+
+::std::wstring
+Test1::WstringClassI::opString(const ::std::wstring& s1,
+			       ::std::wstring& s2,
+			       const Ice::Current& current)
+{
+    s2 = s1;
+    return s1;
+}
+
+::Test1::WstringStruct
+Test1::WstringClassI::opStruct(const ::Test1::WstringStruct& s1,
+			       ::Test1::WstringStruct& s2,
+			       const Ice::Current& current)
+{
+    s2 = s1;
+    return s1;
+}
+
+void
+Test1::WstringClassI::throwExcept(const ::std::wstring& reason,
+				  const Ice::Current& current)
+{
+    Test1::WstringException ex;
+    ex.reason = reason;
+    throw ex;
+}
+
+::std::wstring
+Test2::WstringClassI::opString(const ::std::wstring& s1,
+			       ::std::wstring& s2,
+			       const Ice::Current& current)
+{
+    s2 = s1;
+    return s1;
+}
+
+::Test2::WstringStruct
+Test2::WstringClassI::opStruct(const ::Test2::WstringStruct& s1,
+			       ::Test2::WstringStruct& s2,
+			       const Ice::Current& current)
+{
+    s2 = s1;
+    return s1;
+}
+
+void
+Test2::WstringClassI::throwExcept(const ::std::wstring& reason,
+				  const Ice::Current& current)
+{
+    Test2::WstringException ex;
+    ex.reason = reason;
+    throw ex;
+}
diff --git a/cppe/test/IceE/custom/WstringI.h b/cppe/test/IceE/custom/WstringI.h
new file mode 100644
index 00000000000..3753bd5d620
--- /dev/null
+++ b/cppe/test/IceE/custom/WstringI.h
@@ -0,0 +1,57 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef WSTRING_I_H
+#define WSTRING_I_H
+
+#include <Wstring.h>
+
+namespace Test1
+{
+
+class WstringClassI : virtual public WstringClass
+{
+public:
+
+    virtual ::std::wstring opString(const ::std::wstring&,
+				    ::std::wstring&,
+				    const Ice::Current&);
+
+    virtual ::Test1::WstringStruct opStruct(const ::Test1::WstringStruct&,
+					    ::Test1::WstringStruct&,
+					    const Ice::Current&);
+
+    virtual void throwExcept(const ::std::wstring&,
+			     const Ice::Current&);
+};
+
+}
+
+namespace Test2
+{
+
+class WstringClassI : virtual public WstringClass
+{
+public:
+
+    virtual ::std::wstring opString(const ::std::wstring&,
+				    ::std::wstring&,
+				    const Ice::Current&);
+
+    virtual ::Test2::WstringStruct opStruct(const ::Test2::WstringStruct&,
+					    ::Test2::WstringStruct&,
+					    const Ice::Current&);
+
+    virtual void throwExcept(const ::std::wstring&,
+			     const Ice::Current&);
+};
+
+}
+
+#endif
diff --git a/cppe/test/IceE/custom/customC.dsp b/cppe/test/IceE/custom/customC.dsp
index cd5e3487c64..9b132821bc1 100755
--- a/cppe/test/IceE/custom/customC.dsp
+++ b/cppe/test/IceE/custom/customC.dsp
@@ -45,7 +45,6 @@ RSC=rc.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /c
-# SUBTRACT CPP /Z<none>
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -126,7 +125,6 @@ LINK32=link.exe
 # ADD BASE CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /FD /c
 # SUBTRACT BASE CPP /Fr /YX
 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /c
-# SUBTRACT CPP /Z<none>
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -165,6 +163,10 @@ SOURCE=.\MyByteSeq.cpp
 
 SOURCE=.\Test.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -177,6 +179,10 @@ SOURCE=.\MyByteSeq.h
 
 SOURCE=.\Test.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -248,6 +254,73 @@ BuildCmds= \
 !ENDIF 
 
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.ice
+
+!IF  "$(CFG)" == "customC - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customC - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customC - Win32 Debug Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customC - Win32 Release Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/cppe/test/IceE/custom/customC.vcp b/cppe/test/IceE/custom/customC.vcp
index 38123bc34fa..ea9ff768495 100755
--- a/cppe/test/IceE/custom/customC.vcp
+++ b/cppe/test/IceE/custom/customC.vcp
@@ -2557,6 +2557,485 @@ NODEP_CPP_TEST_=\
 !ENDIF 
 
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.cpp
+
+!IF  "$(CFG)" == "customC - Win32 (WCE emulator) Release"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE emulator) Debug"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ENDIF 
+
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -2569,6 +3048,10 @@ SOURCE=.\MyByteSeq.h
 
 SOURCE=.\Test.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -2700,6 +3183,133 @@ BuildCmds= \
 !ENDIF 
 
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.ice
+
+!IF  "$(CFG)" == "customC - Win32 (WCE emulator) Release"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE emulator) Debug"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE ARMV4) Release"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE ARMV4) Debug"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE ARMV4) Debug Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE ARMV4) Release Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE emulator) Debug Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customC - Win32 (WCE emulator) Release Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/cppe/test/IceE/custom/customCOL.dsp b/cppe/test/IceE/custom/customCOL.dsp
index fd06b676532..66755be765d 100755
--- a/cppe/test/IceE/custom/customCOL.dsp
+++ b/cppe/test/IceE/custom/customCOL.dsp
@@ -45,7 +45,6 @@ RSC=rc.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /c
-# SUBTRACT CPP /Z<none>
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -126,7 +125,6 @@ LINK32=link.exe
 # ADD BASE CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /FD /c
 # SUBTRACT BASE CPP /Fr /YX
 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /c
-# SUBTRACT CPP /Z<none>
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -169,6 +167,14 @@ SOURCE=.\Test.cpp
 
 SOURCE=.\TestI.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\WstringI.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -185,6 +191,14 @@ SOURCE=.\Test.h
 
 SOURCE=.\TestI.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\WstringI.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -256,6 +270,73 @@ BuildCmds= \
 !ENDIF 
 
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.ice
+
+!IF  "$(CFG)" == "customCOL - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 Debug Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 Release Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/cppe/test/IceE/custom/customCOL.vcp b/cppe/test/IceE/custom/customCOL.vcp
index 6fbbc4e2b9a..c48504602a3 100755
--- a/cppe/test/IceE/custom/customCOL.vcp
+++ b/cppe/test/IceE/custom/customCOL.vcp
@@ -3635,6 +3635,860 @@ NODEP_CPP_TESTI=\
 !ENDIF 
 
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.cpp
+
+!IF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Release"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Debug"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\WstringI.cpp
+
+!IF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Release"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Debug"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ENDIF 
+
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -3651,6 +4505,14 @@ SOURCE=.\Test.h
 
 SOURCE=.\TestI.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\WstringI.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -3782,6 +4644,133 @@ BuildCmds= \
 !ENDIF 
 
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.ice
+
+!IF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Release"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Debug"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Release"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Debug"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Debug Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE ARMV4) Release Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Debug Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customCOL - Win32 (WCE emulator) Release Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/cppe/test/IceE/custom/customCOL_CE.vcproj b/cppe/test/IceE/custom/customCOL_CE.vcproj
index 00cfe89bada..40f345205b5 100755
--- a/cppe/test/IceE/custom/customCOL_CE.vcproj
+++ b/cppe/test/IceE/custom/customCOL_CE.vcproj
@@ -1217,6 +1217,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\Wstring.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\WstringI.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1234,6 +1242,14 @@
 				RelativePath="TestI.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Wstring.h"
+				>
+			</File>
+			<File
+				RelativePath=".\WstringI.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -1315,6 +1331,46 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\Wstring.ice"
+				>
+				<FileConfiguration
+					Name="Debug Static|Pocket PC 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="slice2cppe Wstring.ice"
+						Outputs="Wstring.cpp;Wstring.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Pocket PC 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="slice2cppe Wstring.ice"
+						Outputs="Wstring.cpp;Wstring.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release Static|Pocket PC 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="slice2cppe Wstring.ice"
+						Outputs="Wstring.cpp;Wstring.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Pocket PC 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="slice2cppe Wstring.ice"
+						Outputs="Wstring.cpp;Wstring.h"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/cppe/test/IceE/custom/customC_CE.vcproj b/cppe/test/IceE/custom/customC_CE.vcproj
index 5b1a3291ccf..4620265753c 100755
--- a/cppe/test/IceE/custom/customC_CE.vcproj
+++ b/cppe/test/IceE/custom/customC_CE.vcproj
@@ -1141,6 +1141,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\Wstring.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1154,6 +1158,10 @@
 				RelativePath="Test.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Wstring.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -1235,6 +1243,46 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\Wstring.ice"
+				>
+				<FileConfiguration
+					Name="Debug Static|Pocket PC 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="slice2cppe Wstring.ice"
+						Outputs="Wstring.cpp;Wstring.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Pocket PC 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="slice2cppe Wstring.ice"
+						Outputs="Wstring.cpp;Wstring.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release Static|Pocket PC 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="slice2cppe Wstring.ice"
+						Outputs="Wstring.cpp;Wstring.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Pocket PC 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="slice2cppe Wstring.ice"
+						Outputs="Wstring.cpp;Wstring.h"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/cppe/test/IceE/custom/customS.dsp b/cppe/test/IceE/custom/customS.dsp
index 3cdd501e24b..f611a8788f8 100755
--- a/cppe/test/IceE/custom/customS.dsp
+++ b/cppe/test/IceE/custom/customS.dsp
@@ -45,7 +45,6 @@ RSC=rc.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /c
-# SUBTRACT CPP /Z<none>
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -126,7 +125,6 @@ LINK32=link.exe
 # ADD BASE CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /FD /c
 # SUBTRACT BASE CPP /Fr /YX
 # ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /c
-# SUBTRACT CPP /Z<none>
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -165,6 +163,14 @@ SOURCE=.\Test.cpp
 
 SOURCE=.\TestI.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\WstringI.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -181,6 +187,14 @@ SOURCE=.\Test.h
 
 SOURCE=.\TestI.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\WstringI.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -252,6 +266,73 @@ BuildCmds= \
 !ENDIF 
 
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.ice
+
+!IF  "$(CFG)" == "customS - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customS - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customS - Win32 Debug Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customS - Win32 Release Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe.exe -I. Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/cppe/test/IceE/custom/customS.vcp b/cppe/test/IceE/custom/customS.vcp
index 4152142b342..5122c30a5d2 100755
--- a/cppe/test/IceE/custom/customS.vcp
+++ b/cppe/test/IceE/custom/customS.vcp
@@ -2495,6 +2495,860 @@ NODEP_CPP_TESTI=\
 !ENDIF 
 
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.cpp
+
+!IF  "$(CFG)" == "customS - Win32 (WCE emulator) Release"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE emulator) Debug"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_WSTRI=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\BuiltinSequences.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Cond.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\Connection.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\EndpointF.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\IncomingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\Iterator.h"\
+	"..\..\..\include\IceE\LocalException.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\LoggerF.h"\
+	"..\..\..\include\IceE\Monitor.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\OutgoingConnectionFactoryF.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\Thread.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\Time.h"\
+	"..\..\..\include\IceE\TraceLevelsF.h"\
+	"..\..\..\include\IceE\TransceiverF.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\WstringI.cpp
+
+!IF  "$(CFG)" == "customS - Win32 (WCE emulator) Release"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE emulator) Debug"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Release"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Debug"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Debug Static"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Release Static"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE emulator) Debug Static"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE emulator) Release Static"
+
+DEP_CPP_WSTRIN=\
+	"..\..\..\include\IceE\AutoArray.h"\
+	"..\..\..\include\IceE\BasicStream.h"\
+	"..\..\..\include\IceE\Buffer.h"\
+	"..\..\..\include\IceE\CommunicatorF.h"\
+	"..\..\..\include\IceE\Config.h"\
+	"..\..\..\include\IceE\ConnectionF.h"\
+	"..\..\..\include\IceE\Current.h"\
+	"..\..\..\include\IceE\DispatchStatus.h"\
+	"..\..\..\include\IceE\Exception.h"\
+	"..\..\..\include\IceE\ExceptionBase.h"\
+	"..\..\..\include\IceE\FactoryTable.h"\
+	"..\..\..\include\IceE\FactoryTableDef.h"\
+	"..\..\..\include\IceE\Handle.h"\
+	"..\..\..\include\IceE\Identity.h"\
+	"..\..\..\include\IceE\Incoming.h"\
+	"..\..\..\include\IceE\InstanceF.h"\
+	"..\..\..\include\IceE\LocalObject.h"\
+	"..\..\..\include\IceE\LocalObjectF.h"\
+	"..\..\..\include\IceE\Lock.h"\
+	"..\..\..\include\IceE\Mutex.h"\
+	"..\..\..\include\IceE\Object.h"\
+	"..\..\..\include\IceE\ObjectAdapterF.h"\
+	"..\..\..\include\IceE\ObjectF.h"\
+	"..\..\..\include\IceE\OperationMode.h"\
+	"..\..\..\include\IceE\Outgoing.h"\
+	"..\..\..\include\IceE\Protocol.h"\
+	"..\..\..\include\IceE\Proxy.h"\
+	"..\..\..\include\IceE\ProxyF.h"\
+	"..\..\..\include\IceE\ProxyFactoryF.h"\
+	"..\..\..\include\IceE\ProxyHandle.h"\
+	"..\..\..\include\IceE\ReferenceF.h"\
+	"..\..\..\include\IceE\ServantManagerF.h"\
+	"..\..\..\include\IceE\Shared.h"\
+	"..\..\..\include\IceE\StaticMutex.h"\
+	"..\..\..\include\IceE\ThreadException.h"\
+	"..\..\..\include\IceE\UndefSysMacros.h"\
+	"..\..\..\include\IceE\Unicode.h"\
+	"..\..\..\include\IceE\UserExceptionFactory.h"\
+	"..\..\..\include\IceE\UserExceptionFactoryF.h"\
+	".\Wstring.h"\
+	".\WstringI.h"\
+	
+
+!ENDIF 
+
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -2511,6 +3365,14 @@ SOURCE=.\Test.h
 
 SOURCE=.\TestI.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\WstringI.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -2642,6 +3504,133 @@ BuildCmds= \
 !ENDIF 
 
 # End Source File
+# Begin Source File
+
+SOURCE=.\Wstring.ice
+
+!IF  "$(CFG)" == "customS - Win32 (WCE emulator) Release"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE emulator) Debug"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Release"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Debug"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Debug Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE ARMV4) Release Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE emulator) Debug Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "customS - Win32 (WCE emulator) Release Static"
+
+# Begin Custom Build
+InputPath=.\Wstring.ice
+
+BuildCmds= \
+	slice2cppe Wstring.ice
+
+"Wstring.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"Wstring.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/cppe/test/IceE/custom/customS_CE.vcproj b/cppe/test/IceE/custom/customS_CE.vcproj
index 7e2b6c77d2f..5d00773f1b9 100755
--- a/cppe/test/IceE/custom/customS_CE.vcproj
+++ b/cppe/test/IceE/custom/customS_CE.vcproj
@@ -1141,6 +1141,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\Wstring.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\WstringI.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1158,6 +1166,14 @@
 				RelativePath="TestI.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Wstring.h"
+				>
+			</File>
+			<File
+				RelativePath=".\WstringI.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -1239,6 +1255,19 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\Wstring.ice"
+				>
+				<FileConfiguration
+					Name="Debug|Pocket PC 2003 (ARMV4)"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="slice2cppe Wstring.ice"
+						Outputs="Wstring.cpp;Wstring.h"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>