diff --git a/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt index c7ba9c57..ee16f51e 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt @@ -33,7 +33,6 @@ set(pnUtils_SOURCES if(WIN32) set(pnUtils_WIN32 Win32/pnUtW32Misc.cpp - Win32/pnUtW32Str.cpp ) else() set(pnUtils_UNIX diff --git a/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Str.cpp b/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Str.cpp deleted file mode 100644 index 42edb140..00000000 --- a/Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Str.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ -/***************************************************************************** -* -* $/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Str.cpp -* -***/ - -#include "../pnUtils.h" - - -/***************************************************************************** -* -* Exports -* -***/ - -//=========================================================================== -unsigned StrToAnsi (char * dest, const wchar_t source[], unsigned destChars) { - return StrToAnsi(dest, source, destChars, CP_ACP); -} - -//=========================================================================== -unsigned StrToAnsi (char * dest, const wchar_t source[], unsigned destChars, unsigned codePage) { - ASSERT(destChars != (unsigned)-1); - ASSERT(dest != nil); - - int result = WideCharToMultiByte(codePage, 0, source, -1, dest, destChars, nil, nil); - if (result) - return result - 1; // return number of characters not including null terminator - else if (destChars) { - dest[destChars - 1] = 0; // null terminate the destination buffer - return destChars - 1; - } - else - return 0; -} - -//=========================================================================== -unsigned StrToUnicode (wchar_t * dest, const char source[], unsigned destChars) { - return StrToUnicode(dest, source, destChars, CP_ACP); -} - -//=========================================================================== -unsigned StrToUnicode (wchar_t * dest, const char source[], unsigned destChars, unsigned codePage) { - ASSERT(destChars != (unsigned)-1); - ASSERT(dest != nil); - - int result = MultiByteToWideChar(codePage, 0, source, -1, dest, destChars); - if (result) - return result - 1; // return number of characters not including null terminator - else if (destChars) { - dest[destChars - 1] = 0; // null terminate the destination buffer - return destChars - 1; - } - else - return 0; -} diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp b/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp index b290ae65..b4f6167c 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp +++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp @@ -384,22 +384,6 @@ wchar_t * StrDupLen (const wchar_t str[], unsigned chars) { return IStrDupLen(str, chars); } -//============================================================================ -wchar_t * StrDupToUnicode (const char str[]) { - unsigned bytes = StrBytes(str) * sizeof(wchar_t); - wchar_t * dst = (wchar_t*)malloc(bytes); - StrToUnicode(dst, str, bytes / sizeof(wchar_t)); - return dst; -} - -//============================================================================ -char * StrDupToAnsi (const wchar_t str[]) { - unsigned bytes = StrBytes(str) / sizeof(wchar_t); - char * dst = (char*)malloc(bytes); - StrToAnsi(dst, str, bytes); - return dst; -} - //=========================================================================== unsigned StrBytes (const char str[]) { // includes space for terminator return (IStrLen(str) + 1) * sizeof(str[0]); diff --git a/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h b/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h index abfacd85..6867e257 100644 --- a/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h +++ b/Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h @@ -92,9 +92,6 @@ wchar_t * StrDup (const wchar_t str[]); char * StrDupLen (const char str[], unsigned chars); wchar_t * StrDupLen (const wchar_t str[], unsigned chars); -wchar_t * StrDupToUnicode (const char str[]); -char * StrDupToAnsi (const wchar_t str[]); - int StrCmp (const char str1[], const char str2[], unsigned chars = (unsigned)-1); int StrCmp (const wchar_t str1[], const wchar_t str2[], unsigned chars = (unsigned)-1); @@ -112,18 +109,6 @@ void StrCopy (wchar_t * dest, const wchar_t source[], unsigned chars); void StrPack (char * dest, const char source[], unsigned chars); void StrPack (wchar_t * dest, const wchar_t source[], unsigned chars); -unsigned StrToAnsi (char * dest, const wchar_t source[], unsigned destChars); -unsigned StrToAnsi (char * dest, const wchar_t source[], unsigned destChars, unsigned codePage); - -unsigned StrToUnicode (wchar_t * dest, const char source[], unsigned destChars); -unsigned StrToUnicode (wchar_t * dest, const char source[], unsigned destChars, unsigned codePage); - -// FIXME: Get rid of these -inline unsigned StrToUnicode(wchar_t * dest, const plString & source, unsigned destChars) - { return StrToUnicode(dest, source.c_str(), destChars); } -inline unsigned StrToUnicode(wchar_t * dest, const plString & source, unsigned destChars, unsigned codePage) - { return StrToUnicode(dest, source.c_str(), destChars, codePage); } - float StrToFloat (const char source[], const char ** endptr); float StrToFloat (const wchar_t source[], const wchar_t ** endptr);