You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2008/01/07 12:21:48 UTC

svn commit: r609572 - in /xerces/c/trunk/src/xercesc/util/Transcoders: Cygwin/ Win32/Win32TransService.cpp

Author: amassari
Date: Mon Jan  7 03:21:44 2008
New Revision: 609572

URL: http://svn.apache.org/viewvc?rev=609572&view=rev
Log:
Replace usage of mbstowcs and wcsncpy in Win32TransService with APIs supported also on Cygwin

Removed:
    xerces/c/trunk/src/xercesc/util/Transcoders/Cygwin/
Modified:
    xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp

Modified: xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp?rev=609572&r1=609571&r2=609572&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp Mon Jan  7 03:21:44 2008
@@ -199,14 +199,14 @@
 {
     // Transcode the name to Unicode and store that copy
     const XMLSize_t srcLen = strlen(encodingName);
-    size_t targetLen=::mbstowcs(NULL, encodingName, srcLen);
-    if(targetLen!=-1)
+	int targetLen=::MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, encodingName, srcLen, NULL, 0);
+    if(targetLen!=0)
     {
         fEncodingName = (XMLCh*) XMLPlatformUtils::fgMemoryManager->allocate
         (
             (targetLen + 1) * sizeof(XMLCh)
         );//new XMLCh[targetLen + 1];
-        ::mbstowcs(fEncodingName, encodingName, srcLen);
+		::MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, encodingName, srcLen, (LPWSTR)fEncodingName, targetLen);
         fEncodingName[targetLen] = 0;
 
         //
@@ -430,14 +430,14 @@
         if (isAlias(encodingKey, aliasBuf, nameBufSz))
         {
             const XMLSize_t srcLen = strlen(aliasBuf);
-            size_t targetLen=::mbstowcs(NULL, aliasBuf, srcLen);
-            if(targetLen!=-1)
+            int targetLen = ::MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, aliasBuf, srcLen, NULL, 0);
+            if(targetLen!=0)
             {
                 XMLCh* uniAlias = (XMLCh*) XMLPlatformUtils::fgMemoryManager->allocate
                 (
                     (targetLen + 1) * sizeof(XMLCh)
                 );//new XMLCh[targetLen + 1];
-                ::mbstowcs(uniAlias, aliasBuf, srcLen);
+	            ::MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, aliasBuf, srcLen, (LPWSTR)uniAlias, targetLen);
                 uniAlias[targetLen] = 0;
                 wcsupr(uniAlias);
 
@@ -446,14 +446,14 @@
                 if (aliasedEntry)
                 {
                     const XMLSize_t srcLen = strlen(nameBuf);
-                    size_t targetLen=::mbstowcs(NULL, nameBuf, srcLen);
-                    if(targetLen!=-1)
+		            int targetLen = ::MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, nameBuf, srcLen, NULL, 0);
+                    if(targetLen!=0)
                     {
                         XMLCh* uniName = (XMLCh*) XMLPlatformUtils::fgMemoryManager->allocate
                         (
                             (targetLen + 1) * sizeof(XMLCh)
                         );//new XMLCh[targetLen + 1];
-                        ::mbstowcs(uniName, nameBuf, srcLen);
+			            ::MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, nameBuf, srcLen, (LPWSTR)uniName, targetLen);
                         uniName[targetLen] = 0;
                         wcsupr(uniName);
 
@@ -572,8 +572,7 @@
     //  Get an upper cased copy of the encoding name, since we use a hash
     //  table and we store them all in upper case.
     //
-    ::wcsncpy(upEncoding, encodingName, upLen);
-    upEncoding[upLen] = 0;
+	XMLString::copyNString(upEncoding, encodingName, upLen);
     wcsupr(upEncoding);
 
     // Now to try to find this guy in the CP map



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org