Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Windows version check from wxMBConv_win32.

Browse Source 
We don't support systems predating Windows 2000 SP4 any more, so there is no
need to check for them. This also allows to get rid of the code checking for
conversion correctness.

Also remove the broken URLs from the comments, they didn't contain any
particularly useful information anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-04-27 22:39:28 +00:00
parent f18d7097da
commit 761e0c12a0
1 changed files with 4 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/common/strconv.cpp
View File

@@ -2586,11 +2586,9 @@ public:
// wouldn't work if reading an incomplete MB char didn't result in an
// error
//
// Moreover, MB_ERR_INVALID_CHARS is only supported on Win 2K SP4 or
// Win XP or newer and it is not supported for UTF-[78] so we always
// use our own conversions in this case. See
// http://blogs.msdn.com/michkap/archive/2005/04/19/409566.aspx
// http://msdn.microsoft.com/library/en-us/intl/unicode_17si.asp
// Moreover, MB_ERR_INVALID_CHARS is not supported for UTF-8 under XP
// and for UTF-7 under any Windows version, so we always use our own
// conversions in this case.
if ( m_CodePage == CP_UTF8 )
{
return wxMBConvUTF8().MB2WC(buf, psz, n);
@@ -2601,52 +2599,17 @@ public:
return wxMBConvUTF7().MB2WC(buf, psz, n);
}
int flags = 0;
if ( (m_CodePage < 50000 && m_CodePage != CP_SYMBOL) &&
IsAtLeastWin2kSP4() )
{
flags = MB_ERR_INVALID_CHARS;
}
const size_t len = ::MultiByteToWideChar
(
m_CodePage, // code page
flags, // flags: fall on error
MB_ERR_INVALID_CHARS, // flags: fall on error
psz, // input string
-1, // its length (NUL-terminated)
buf, // output string
buf ? n : 0 // size of output buffer
);
if ( !len )
{
// function totally failed
return wxCONV_FAILED;
}
// if we were really converting and didn't use MB_ERR_INVALID_CHARS,
// check if we succeeded, by doing a double trip:
if ( !flags && buf )
{
const size_t mbLen = strlen(psz);
wxCharBuffer mbBuf(mbLen);
if ( ::WideCharToMultiByte
(
m_CodePage,
0,
buf,
-1,
mbBuf.data(),
mbLen + 1, // size in bytes, not length
NULL,
NULL
) == 0 ||
strcmp(mbBuf, psz) != 0 )
{
// we didn't obtain the same thing we started from, hence
// the conversion was lossy and we consider that it failed
return wxCONV_FAILED;
}
}
// note that it returns count of written chars for buf != NULL and size
// of the needed buffer for buf == NULL so in either case the length of
@@ -2820,33 +2783,6 @@ private:
return s_isWin98Or2k == 1;
}
static bool IsAtLeastWin2kSP4()
{
#ifdef __WXWINCE__
return false;
#else
static int s_isAtLeastWin2kSP4 = -1;
if ( s_isAtLeastWin2kSP4 == -1 )
{
OSVERSIONINFOEX ver;
memset(&ver, 0, sizeof(ver));
ver.dwOSVersionInfoSize = sizeof(ver);
GetVersionEx((OSVERSIONINFO*)&ver);
s_isAtLeastWin2kSP4 =
((ver.dwMajorVersion > 5) || // Vista+
(ver.dwMajorVersion == 5 && ver.dwMinorVersion > 0) || // XP/2003
(ver.dwMajorVersion == 5 && ver.dwMinorVersion == 0 &&
ver.wServicePackMajor >= 4)) // 2000 SP4+
? 1 : 0;
}
return s_isAtLeastWin2kSP4 == 1;
#endif
}
// the code page we're working with
long m_CodePage;