[GME-commit] GMESRC/GME/Include/xercesc/util/Transcoders/Win32 Win32TransService.cpp, NONE, 1.1 Win32TransService2.cpp, NONE, 1.1 Win32TransService.hpp, 1.1.1.1, 1.2

Tue Feb 19 14:16:33 CST 2008

Update of /project/gme-repository/GMESRC/GME/Include/xercesc/util/Transcoders/Win32
In directory escher:/tmp/cvs-serv26529/util/Transcoders/Win32

Modified Files:
	Win32TransService.hpp 
Added Files:
	Win32TransService.cpp Win32TransService2.cpp 
Log Message:
Xerces2.7 includes checkin.

CVS User: Zoltan Molnar, ISIS (zolmol)

--- NEW FILE: Win32TransService2.cpp ---
/*
 * Copyright 1999-2000,2004 The Apache Software Foundation.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

/*
 * $Log: Win32TransService2.cpp,v $
 * Revision 1.1  2008/02/19 20:16:31  zolmol
 * Xerces2.7 includes checkin.
 *
 * Revision 1.3  2004/09/08 13:56:47  peiyongz
 * Apache License Version 2.0
 *
 * Revision 1.2  2002/11/04 15:14:34  tng
 * C++ Namespace Support.
 *
 * Revision 1.1.1.1  2002/02/01 22:22:37  peiyongz
 * sane_include
 *
 * Revision 1.3  2000/05/09 00:22:45  andyh
 * Memory Cleanup.  XMLPlatformUtils::Terminate() deletes all lazily
 * allocated memory; memory leak checking tools will no longer report
 * that leaks exist.  (DOM GetElementsByTagID temporarily removed
 * as part of this.)
 *
 * Revision 1.2  2000/03/18 00:00:04  roddey
 * Initial updates for two way transcoding support
 *
 * Revision 1.1  2000/03/08 23:40:37  roddey
 * Oops, I think I forgot to commit this new file
 *
 */

// ---------------------------------------------------------------------------
//  Includes
// ---------------------------------------------------------------------------
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/RefHashTableOf.hpp>
#include <xercesc/util/XMLUni.hpp>
#include "Win32TransService.hpp"
#include <windows.h>

XERCES_CPP_NAMESPACE_BEGIN
XERCES_CPP_NAMESPACE_END

Index: Win32TransService.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xercesc/util/Transcoders/Win32/Win32TransService.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Win32TransService.hpp	14 Apr 2004 10:08:23 -0000	1.1.1.1
--- Win32TransService.hpp	19 Feb 2008 20:16:31 -0000	1.2
***************
*** 1,123 ****
  /*
!  * The Apache Software License, Version 1.1
!  *
!  * Copyright (c) 1999-2000 The Apache Software Foundation.  All rights
!  * reserved.
!  *
!  * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
!  *
!  * 1. Redistributions of source code must retain the above copyright
!  *    notice, this list of conditions and the following disclaimer.
!  *
!  * 2. Redistributions in binary form must reproduce the above copyright
!  *    notice, this list of conditions and the following disclaimer in
!  *    the documentation and/or other materials provided with the
!  *    distribution.
!  *
!  * 3. The end-user documentation included with the redistribution,
!  *    if any, must include the following acknowledgment:
!  *       "This product includes software developed by the
!  *        Apache Software Foundation (http://www.apache.org/)."
!  *    Alternately, this acknowledgment may appear in the software itself,
!  *    if and wherever such third-party acknowledgments normally appear.
!  *
!  * 4. The names "Xerces" and "Apache Software Foundation" must
!  *    not be used to endorse or promote products derived from this
!  *    software without prior written permission. For written
!  *    permission, please contact apache\@apache.org.
!  *
!  * 5. Products derived from this software may not be called "Apache",
!  *    nor may "Apache" appear in their name, without prior written
!  *    permission of the Apache Software Foundation.
!  *
!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
!  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
!  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
!  * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
!  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
!  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
!  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
!  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
!  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
!  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
!  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
!  * SUCH DAMAGE.
!  * ====================================================================
!  *
!  * This software consists of voluntary contributions made by many
!  * individuals on behalf of the Apache Software Foundation, and was
!  * originally based on software copyright (c) 1999, International
!  * Business Machines, Inc., http://www.ibm.com .  For more information
!  * on the Apache Software Foundation, please see
!  * <http://www.apache.org/>.
   */

  /*
!  * $Log$
!  * Revision 1.1.1.1  2004/04/14 10:08:23  volgy
!  * Importing Xerces library 2.4
!  *
!  * Revision 1.6  2003/05/17 16:32:18  knoaman
!  * Memory manager implementation : transcoder update.
!  *
!  * Revision 1.5  2003/05/15 18:47:07  knoaman
!  * Partial implementation of the configurable memory manager.
!  *
!  * Revision 1.4  2003/03/07 18:15:58  tng
!  * Return a reference instead of void for operator=
!  *
!  * Revision 1.3  2002/11/04 15:14:34  tng
!  * C++ Namespace Support.
!  *
!  * Revision 1.2  2002/04/09 15:44:00  knoaman
!  * Add lower case string support.
!  *
!  * Revision 1.1.1.1  2002/02/01 22:22:37  peiyongz
!  * sane_include
!  *
!  * Revision 1.10  2000/05/09 00:22:45  andyh
!  * Memory Cleanup.  XMLPlatformUtils::Terminate() deletes all lazily
!  * allocated memory; memory leak checking tools will no longer report
!  * that leaks exist.  (DOM GetElementsByTagID temporarily removed
!  * as part of this.)
!  *
!  * Revision 1.9  2000/03/18 00:00:04  roddey
!  * Initial updates for two way transcoding support
!  *
!  * Revision 1.8  2000/03/07 23:45:36  roddey
!  * First cut for additions to Win32 xcode. Based very loosely on a
!  * prototype from Eric Ulevik.
!  *
!  * Revision 1.7  2000/03/02 19:55:36  roddey
!  * This checkin includes many changes done while waiting for the
!  * 1.1.0 code to be finished. I can't list them all here, but a list is
!  * available elsewhere.
!  *
!  * Revision 1.6  2000/02/06 07:48:34  rahulj
!  * Year 2K copyright swat.
!  *
!  * Revision 1.5  2000/01/25 22:49:58  roddey
!  * Moved the supportsSrcOfs() method from the individual transcoder to the
!  * transcoding service, where it should have been to begin with.
!  *
!  * Revision 1.4  2000/01/25 19:19:09  roddey
!  * Simple addition of a getId() method to the xcode and netacess abstractions to
!  * allow each impl to give back an id string.
!  *
!  * Revision 1.3  1999/12/18 00:22:33  roddey
!  * Changes to support the new, completely orthagonal, transcoder architecture.
!  *
!  * Revision 1.2  1999/12/15 19:44:02  roddey
!  * Now implements the new transcoding abstractions, with separate interface
!  * classes for XML transcoders and local code page transcoders.
!  *
!  * Revision 1.1.1.1  1999/11/09 01:06:06  twl
!  * Initial checkin
!  *
!  * Revision 1.2  1999/11/08 20:45:35  rahul
!  * Swat for adding in Product name and CVS comment log variable.
!  *
   */

--- 1,20 ----
  /*
!  * Copyright 1999-2000,2004 The Apache Software Foundation.
!  * 
!  * Licensed under the Apache License, Version 2.0 (the "License");
!  * you may not use this file except in compliance with the License.
!  * You may obtain a copy of the License at
!  * 
!  *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
!  * Unless required by applicable law or agreed to in writing, software
!  * distributed under the License is distributed on an "AS IS" BASIS,
!  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
!  * See the License for the specific language governing permissions and
!  * limitations under the License.
   */

  /*
!  * $Id$
   */

***************
*** 316,322 ****
      //  Implementation of the virtual transcoder interface
      // -----------------------------------------------------------------------
!     virtual unsigned int calcRequiredSize(const char* const srcText);

!     virtual unsigned int calcRequiredSize(const XMLCh* const srcText);

      virtual char* transcode(const XMLCh* const toTranscode);
--- 213,221 ----
      //  Implementation of the virtual transcoder interface
      // -----------------------------------------------------------------------
!     virtual unsigned int calcRequiredSize(const char* const srcText
!         , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);

!     virtual unsigned int calcRequiredSize(const XMLCh* const srcText
!         , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);

      virtual char* transcode(const XMLCh* const toTranscode);
***************
*** 333,336 ****
--- 232,236 ----
          ,       XMLCh* const    toFill
          , const unsigned int    maxChars
+         , MemoryManager* const  manager = XMLPlatformUtils::fgMemoryManager
      );

***************
*** 340,343 ****
--- 240,244 ----
          ,       char* const     toFill
          , const unsigned int    maxChars
+         , MemoryManager* const  manager = XMLPlatformUtils::fgMemoryManager
      );

--- NEW FILE: Win32TransService.cpp ---
/*
 * Copyright 1999-2004 The Apache Software Foundation.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

/*
 * $Id: Win32TransService.cpp,v 1.1 2008/02/19 20:16:31 zolmol Exp $
 */
[...964 lines suppressed...]
    if (!*toTranscode)
    {
        toFill[0] = 0;
        return true;
    }

    // This one has a fixed size output, so try it and if it fails it fails
    if ( 0 == ::WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)toTranscode, -1, toFill, maxBytes + 1, NULL, NULL) )
        return false;

    // Cap it off just in case
    toFill[maxBytes] = 0;
    return true;
}

XERCES_CPP_NAMESPACE_END