[Winmerge-svn] SF.net SVN: winmerge:[7447] branches/R2_14/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2010-11-24 07:58:23
|
Revision: 7447 http://winmerge.svn.sourceforge.net/winmerge/?rev=7447&view=rev Author: gerundt Date: 2010-11-24 07:58:17 +0000 (Wed, 24 Nov 2010) Log Message: ----------- PATCH: [ 3116407 ] Drop _UNICODE preprocessor definition Modified Paths: -------------- branches/R2_14/Src/AboutDlg.cpp branches/R2_14/Src/Common/SuperComboBox.cpp branches/R2_14/Src/Common/UniFile.cpp branches/R2_14/Src/Common/UnicodeString.h branches/R2_14/Src/Common/coretools.cpp branches/R2_14/Src/Common/string_util.cpp branches/R2_14/Src/Common/unicoder.cpp branches/R2_14/Src/MainFrm.cpp branches/R2_14/Src/ProjectFile.cpp branches/R2_14/Src/StdAfx.cpp branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp branches/R2_14/Src/editlib/ccrystaltextview.cpp branches/R2_14/Src/editlib/ccrystaltextview.h branches/R2_14/Src/editlib/crystalparser.cpp branches/R2_14/Src/editlib/filesup.cpp branches/R2_14/Src/paths.cpp Modified: branches/R2_14/Src/AboutDlg.cpp =================================================================== --- branches/R2_14/Src/AboutDlg.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/AboutDlg.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -72,10 +72,8 @@ CString sVersion = version.GetFixedProductVersion(); LangFormatString1(m_strVersion, IDS_VERSION_FMT, sVersion); -#ifdef _UNICODE m_strVersion += _T(" "); m_strVersion += theApp.LoadString(IDS_UNICODE).c_str(); -#endif #ifdef WIN64 m_strVersion += _T(" "); Modified: branches/R2_14/Src/Common/SuperComboBox.cpp =================================================================== --- branches/R2_14/Src/Common/SuperComboBox.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/Common/SuperComboBox.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -421,11 +421,7 @@ if (SUCCEEDED(hres)) { WCHAR wsz[MAX_PATH]; -#ifdef _UNICODE wcsncpy((wchar_t *)wsz, lpsz, sizeof(wsz)/sizeof(WCHAR)); -#else - ::MultiByteToWideChar(CP_ACP, 0, lpsz, -1, wsz, MAX_PATH); -#endif // Load shortcut hres = ppf->Load((LPCOLESTR)wsz, STGM_READ); Modified: branches/R2_14/Src/Common/UniFile.cpp =================================================================== --- branches/R2_14/Src/Common/UniFile.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/Common/UniFile.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -466,7 +466,6 @@ // shortcut methods in case file is in the same encoding as our Strings -#ifdef _UNICODE if (m_unicoding == ucr::UCS2LE) { int cchLine = 0; @@ -512,53 +511,6 @@ line.assign(pchLine, cchLine); return true; } -#else - if (m_unicoding == ucr::NONE && EqualCodepages(m_codepage, getDefaultCodepage())) - { - int cchLine = 0; - // If there aren't any bytes left in the file, return FALSE to indicate EOF - if (m_current - m_base >= m_filesize) - return false; - // Loop through chars, watching for eol chars or zero - while (m_current - m_base < m_filesize) - { - char ch = *m_current; - int ch_offset = (m_current - m_base); - ++m_current; - if (ch == '\n' || ch == '\r') - { - eol += ch; - if (ch == '\r') - { - if (m_current - m_base < m_filesize && *m_current == '\n') - { - eol += '\n'; - ++m_current; - ++m_txtstats.ncrlfs; - } - else - { - ++m_txtstats.ncrs; - } - } - else - { - ++m_txtstats.nlfs; - } - ++m_lineno; - line.assign(pchLine, cchLine); - return true; - } - if (!ch) - { - RecordZero(m_txtstats, ch_offset); - } - ++cchLine; - } - line.assign(pchLine, cchLine); - return true; - } -#endif if (m_current - m_base + (m_charsize - 1) >= m_filesize) return false; @@ -965,11 +917,7 @@ bool UniStdioFile::WriteString(const String & line) { // shortcut the easy cases -#ifdef _UNICODE if (m_unicoding == ucr::UCS2LE) -#else - if (m_unicoding == ucr::NONE && EqualCodepages(m_codepage, getDefaultCodepage())) -#endif { unsigned int bytes = line.length() * sizeof(TCHAR); unsigned int wbytes = fwrite(line.c_str(), 1, bytes, m_fp); Modified: branches/R2_14/Src/Common/UnicodeString.h =================================================================== --- branches/R2_14/Src/Common/UnicodeString.h 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/Common/UnicodeString.h 2010-11-24 07:58:17 UTC (rev 7447) @@ -29,11 +29,7 @@ #include <string> -#ifdef _UNICODE #define std_tchar(type) std::w##type -#else -#define std_tchar(type) std::type -#endif // _UNICODE typedef std_tchar(string) String; Modified: branches/R2_14/Src/Common/coretools.cpp =================================================================== --- branches/R2_14/Src/Common/coretools.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/Common/coretools.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -197,13 +197,7 @@ */ bool IsSlashOrColon(LPCTSTR pszChar, LPCTSTR begin) { -#ifdef _UNICODE return (*pszChar == '/' || *pszChar == ':' || *pszChar == '\\'); -#else - // Avoid 0x5C (ASCII backslash) byte occurring as trail byte in MBCS - return (*pszChar == '/' || *pszChar == ':' - || (*pszChar == '\\' && !_ismbstrail((unsigned char *)begin, (unsigned char *)pszChar))); -#endif } /** Modified: branches/R2_14/Src/Common/string_util.cpp =================================================================== --- branches/R2_14/Src/Common/string_util.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/Common/string_util.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -20,11 +20,7 @@ // codepoints don't extend that high). static wint_t normch(wint_t c) { -#ifdef _UNICODE return (unsigned short)(short)c; -#else - return (unsigned char)(char)c; -#endif } /** @brief Return nonzero if input is outside ASCII or is underline. */ Modified: branches/R2_14/Src/Common/unicoder.cpp =================================================================== --- branches/R2_14/Src/Common/unicoder.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/Common/unicoder.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -313,7 +313,6 @@ */ String maketchar(unsigned int unich, bool & lossy, unsigned int codepage) { -#ifdef _UNICODE if (unich < 0x10000) { String s(1, (TCHAR)unich); @@ -321,47 +320,6 @@ } lossy = TRUE; return _T("?"); -#else - if (unich < 0x80) - { - String s(1, (TCHAR)unich); - return s; - } - wchar_t wch = (wchar_t)unich; - if (!lossy) - { - static bool vercheck = false; - static bool has_no_best_fit = false; - if (!vercheck) - { - if (!f_osvi_fetched) fetch_verinfo(); - // Need 2000 (5.x) or 98 (4.10) - has_no_best_fit = f_osvi.dwMajorVersion >= 5 || (f_osvi.dwMajorVersion == 4 && f_osvi.dwMinorVersion >= 10); - vercheck = true; - } - // So far it isn't lossy, so try for lossless conversion - TCHAR outch; - BOOL defaulted = FALSE; - DWORD flags = has_no_best_fit ? WC_NO_BEST_FIT_CHARS : 0; - if (WideCharToMultiByte(codepage, flags, &wch, 1, &outch, 1, NULL, &defaulted) - && !defaulted) - { - String s(1, outch); - return s; - } - lossy = TRUE; - } - // already lossy, so make our best shot - DWORD flags = WC_COMPOSITECHECK + WC_DISCARDNS + WC_SEPCHARS + WC_DEFAULTCHAR; - TCHAR outbuff[16]; - int n = WideCharToMultiByte(codepage, flags, &wch, 1, outbuff, sizeof(outbuff) - 1, NULL, NULL); - if (n > 0) - { - outbuff[n] = 0; - return outbuff; - } - return _T("?"); -#endif } /** @@ -398,14 +356,8 @@ */ void getInternalEncoding(UNICODESET * unicoding, int * codepage) { -#ifdef _UNICODE *unicoding = UCS2LE; *codepage = 0; -#else - // NB: Windows always draws in CP_ACP, not CP_THREAD_ACP, so we must use CP_ACP as an internal codepage - *unicoding = NONE; - *codepage = CP_ACP; -#endif } /** Modified: branches/R2_14/Src/MainFrm.cpp =================================================================== --- branches/R2_14/Src/MainFrm.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/MainFrm.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -357,11 +357,7 @@ static StatusDisplay myStatusDisplay; -#ifdef _UNICODE const TCHAR CMainFrame::szClassName[] = _T("WinMergeWindowClassW"); -#else -const TCHAR CMainFrame::szClassName[] = _T("WinMergeWindowClassA"); -#endif /** * @brief Change MainFrame window class name * see http://support.microsoft.com/kb/403825/ja @@ -3406,17 +3402,10 @@ // this is the command id, not the button index AfxExtractSubString(strTipText, strFullText.c_str(), 1, '\n'); } -#ifndef _UNICODE if (pNMHDR->code == TTN_NEEDTEXTA) - lstrcpyn(pTTTA->szText, strTipText, countof(pTTTA->szText)); - else - _mbstowcsz(pTTTW->szText, strTipText, countof(pTTTW->szText)); -#else - if (pNMHDR->code == TTN_NEEDTEXTA) _wcstombsz(pTTTA->szText, strTipText, countof(pTTTA->szText)); else lstrcpyn(pTTTW->szText, strTipText, countof(pTTTW->szText)); -#endif *pResult = 0; // bring the tooltip window above other popup windows Modified: branches/R2_14/Src/ProjectFile.cpp =================================================================== --- branches/R2_14/Src/ProjectFile.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/ProjectFile.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -41,13 +41,8 @@ #define UTF82A(lpu) W2A(UTF82W(lpu)) #define A2UTF8(lpa) W2UTF8(A2W(lpa)) -#ifdef _UNICODE -# define UTF82T(lpu) UTF82W(lpu) -# define T2UTF8(lpw) W2UTF8(lpw) -#else -# define UTF82T(lpu) UTF82A(lpu) -# define T2UTF8(lpw) A2UTF8(lpw) -#endif +#define UTF82T(lpu) UTF82W(lpu) +#define T2UTF8(lpw) W2UTF8(lpw) // Constants for xml element names const char Root_element_name[] = "project"; Modified: branches/R2_14/Src/StdAfx.cpp =================================================================== --- branches/R2_14/Src/StdAfx.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/StdAfx.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -152,11 +152,7 @@ // Get appropriate clipboard format for TCHAR text int GetClipTcharTextFormat() { -#ifdef _UNICODE return CF_UNICODETEXT; -#else - return CF_TEXT; -#endif // _UNICODE } #if _MSC_VER <= 1310 Modified: branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp =================================================================== --- branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -520,11 +520,7 @@ __try { TCHAR drive[_MAX_PATH], dir[_MAX_PATH], name[_MAX_PATH], ext[_MAX_PATH]; -#ifdef _UNICODE _wsplitpath (pszFileName, drive, dir, name, ext); -#else - _splitpath (pszFileName, drive, dir, name, ext); -#endif _tcscpy (szTempFileDir, drive); _tcscat (szTempFileDir, dir); _tcscpy (szBackupFileName, pszFileName); @@ -1830,15 +1826,7 @@ ASSERT (m_bInit); // Text buffer not yet initialized. // You must call InitNew() or LoadFromFile() first! -#ifdef _UNICODE return FALSE; -#else // _UNICODE - const unsigned char *string = (const unsigned char *) GetLineChars (nLine); - const unsigned char *current = string + nCol; - if (_ismbslead (string, current) < 0) - return TRUE; - return FALSE; -#endif // _UNICODE } BOOL CCrystalTextBuffer:: @@ -1847,15 +1835,7 @@ ASSERT (m_bInit); // Text buffer not yet initialized. // You must call InitNew() or LoadFromFile() first! -#ifdef _UNICODE return FALSE; -#else // _UNICODE - const unsigned char *string = (const unsigned char *) GetLineChars (nLine); - const unsigned char *current = string + nCol; - if (_ismbstrail (string, current) < 0) - return TRUE; - return FALSE; -#endif // _UNICODE } //BEGIN SW Modified: branches/R2_14/Src/editlib/ccrystaltextview.cpp =================================================================== --- branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -926,11 +926,7 @@ return GetCharWidth() * 3; // This assumes a fixed width font // But the UNICODE case handles double-wide glyphs (primarily Chinese characters) -#ifdef _UNICODE return GetCharWidthUnicodeChar(ch); -#else - return GetCharWidth(); -#endif } /** @@ -940,14 +936,10 @@ { // This assumes a fixed width font // But the UNICODE case handles double-wide glyphs (primarily Chinese characters) -#ifdef _UNICODE int n=0; for (LPCTSTR p = lpsz; *p; ++p) n += GetCharWidthUnicodeChar(*p); return n; -#else - return strlen(lpsz) * GetCharWidth(); -#endif } /** @@ -1028,10 +1020,6 @@ int nCount = lineLen - ibegin; int nCountFit = nWidth / nCharWidth + 2/* wide char */; if (nCount > nCountFit) { -#ifndef _UNICODE - if (_ismbslead((unsigned char *)(LPCSTR)line, (unsigned char *)(LPCSTR)line + nCountFit - 1)) - nCountFit++; -#endif nCount = nCountFit; } @@ -1670,10 +1658,6 @@ bLastCharSpace = FALSE; nNonbreakChars++; } -#ifndef _UNICODE - if (IsDBCSLeadByte (ch)) - strHTML += strText[++i]; -#endif if ((nNonbreakChars % nScreenChars) == nScreenChars - 1) { strHTML += _T("<wbr>"); @@ -6011,7 +5995,6 @@ return m_pTextBuffer->GetLineEol(nLine); } -#ifdef _UNICODE int CCrystalTextView::GetCharWidthUnicodeChar(wchar_t ch) { if (!m_bChWidthsCalculated[ch/256]) @@ -6046,15 +6029,12 @@ else return GetCharWidth(); } -#endif /** @brief Reset computed unicode character widths. */ void CCrystalTextView::ResetCharWidths () { -#ifdef _UNICODE ZeroMemory(m_bChWidthsCalculated, sizeof(m_bChWidthsCalculated)); ZeroMemory(m_iChDoubleWidthFlags, sizeof(m_iChDoubleWidthFlags)); -#endif } // This function assumes selection is in one line Modified: branches/R2_14/Src/editlib/ccrystaltextview.h =================================================================== --- branches/R2_14/Src/editlib/ccrystaltextview.h 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/editlib/ccrystaltextview.h 2010-11-24 07:58:17 UTC (rev 7447) @@ -464,11 +464,9 @@ int GetCharWidthFromString(LPCTSTR lpsz); int GetCharWidthFromDisplayableChar(const ViewableWhitespaceChars * lpspc, TCHAR ch); -#ifdef _UNICODE BOOL m_bChWidthsCalculated[65536/256]; int m_iChDoubleWidthFlags[65536/32]; int GetCharWidthUnicodeChar(wchar_t ch); -#endif void ResetCharWidths(); //BEGIN SW Modified: branches/R2_14/Src/editlib/crystalparser.cpp =================================================================== --- branches/R2_14/Src/editlib/crystalparser.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/editlib/crystalparser.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -95,14 +95,7 @@ // remember whitespace WORD wCharType; -#ifdef _UNICODE GetStringTypeW(CT_CTYPE3, &szLine[i], 1, &wCharType); -#else - if (IsDBCSLeadByte((BYTE)szLine[i])) - GetStringTypeA(LOCALE_USER_DEFAULT,CT_CTYPE3, &szLine[i], 2, &wCharType); - else - wCharType = 0; -#endif if( szLine[i] == _T('\t') || szLine[i] == _T(' ') || (wCharType & (C3_IDEOGRAPH | C3_HIRAGANA | C3_KATAKANA))) bBreakable = TRUE; Modified: branches/R2_14/Src/editlib/filesup.cpp =================================================================== --- branches/R2_14/Src/editlib/filesup.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/editlib/filesup.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -45,11 +45,7 @@ do if ((test = sString.GetAt (--posit)) == _T ('.')) return posit; -#ifdef _UNICODE while (posit && test != _T ('\\') && test != _T (':')); -#else - while (posit && (test != _T ('\\') || _ismbstrail((unsigned char *)pszString, (unsigned char *)pszString + posit)) && test != _T (':')); -#endif return len; } @@ -90,11 +86,7 @@ int posit = sString.GetLength (); TCHAR test; do -#ifdef _UNICODE if ((test = sString.GetAt (--posit)) == _T ('\\') || test == _T (':')) -#else - if (((test = sString.GetAt (--posit)) == _T ('\\') && !_ismbstrail((unsigned char *)pszString, (unsigned char *)pszString + posit)) || test == _T (':')) -#endif return posit + 1; while (posit); return posit; @@ -111,11 +103,7 @@ TCHAR test = sString.GetAt (posit - 1); -#ifdef _UNICODE if (test == _T (':') || test == _T ('\\') && (posit == 1 || posit != 1 && sString.GetAt (posit - 2) == _T (':'))) -#else - if (test == _T (':') || (test == _T ('\\') && !_ismbstrail((unsigned char *)(LPCTSTR)sString, (unsigned char *)(LPCTSTR)sString + posit)) && (posit == 1 || posit != 1 && sString.GetAt (posit - 2) == _T (':'))) -#endif return sString.Left (posit); return sString.Left (bClose ? posit : test == _T (':') ? posit : posit - 1); } Modified: branches/R2_14/Src/paths.cpp =================================================================== --- branches/R2_14/Src/paths.cpp 2010-11-24 07:57:25 UTC (rev 7446) +++ branches/R2_14/Src/paths.cpp 2010-11-24 07:58:17 UTC (rev 7447) @@ -26,12 +26,7 @@ static bool IsSlash(LPCTSTR pszStart, int nPos) { return pszStart[nPos]=='/' || -#ifdef _UNICODE pszStart[nPos]=='\\'; -#else - // Avoid 0x5C (ASCII backslash) byte occurring as trail byte in MBCS - (pszStart[nPos]=='\\' && !_ismbstrail((unsigned char *)pszStart, (unsigned char *)pszStart + nPos)); -#endif } /** @@ -431,11 +426,7 @@ if (SUCCEEDED(hres)) { WCHAR wsz[MAX_PATH]; -#ifdef _UNICODE wcsncpy((wchar_t *)wsz, inFile.c_str(), sizeof(wsz) / sizeof(WCHAR)); -#else - ::MultiByteToWideChar(CP_ACP, 0, inFile.c_str(), -1, wsz, MAX_PATH); -#endif // Load shortcut hres = ppf->Load(wsz, STGM_READ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |