Thread: [Winmerge-svn] SF.net SVN: winmerge:[7348] trunk/Src (Page 7)
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <jt...@us...> - 2010-10-24 07:57:21
|
Revision: 7348 http://winmerge.svn.sourceforge.net/winmerge/?rev=7348&view=rev Author: jtuc Date: 2010-10-24 07:57:15 +0000 (Sun, 24 Oct 2010) Log Message: ----------- Possibly fix a possible 64 bit issue. (Unfortunately I have no way to test this.) Modified Paths: -------------- trunk/Src/7zCommon.cpp trunk/Src/dllpstub.h Modified: trunk/Src/7zCommon.cpp =================================================================== --- trunk/Src/7zCommon.cpp 2010-10-23 15:04:07 UTC (rev 7347) +++ trunk/Src/7zCommon.cpp 2010-10-24 07:57:15 UTC (rev 7348) @@ -735,7 +735,7 @@ */ Merge7z::Proxy Merge7z = { - 0, 0, DllBuild_Merge7z, + { 0, 0, DllBuild_Merge7z }, "Merge7z%u%02u"DECORATE_U".dll", "Merge7z" }; Modified: trunk/Src/dllpstub.h =================================================================== --- trunk/Src/dllpstub.h 2010-10-23 15:04:07 UTC (rev 7347) +++ trunk/Src/dllpstub.h 2010-10-24 07:57:15 UTC (rev 7348) @@ -36,6 +36,7 @@ DWORD dwMajorVersion; // Major version DWORD dwMinorVersion; // Minor version DWORD dwBuildNumber; // Build number + DWORD dwPadding; // Pad to 64 bit boundary static void Throw(LPCSTR name, HMODULE, DWORD dwError, BOOL bFreeLibrary); HMODULE Load(); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jt...@us...> - 2010-10-24 11:59:13
|
Revision: 7349 http://winmerge.svn.sourceforge.net/winmerge/?rev=7349&view=rev Author: jtuc Date: 2010-10-24 11:59:07 +0000 (Sun, 24 Oct 2010) Log Message: ----------- stringdiffs: Avoid unnecessary std::vector copy construction. Modified Paths: -------------- trunk/Src/stringdiffs.cpp trunk/Src/stringdiffsi.h Modified: trunk/Src/stringdiffs.cpp =================================================================== --- trunk/Src/stringdiffs.cpp 2010-10-24 07:57:15 UTC (rev 7348) +++ trunk/Src/stringdiffs.cpp 2010-10-24 11:59:07 UTC (rev 7349) @@ -826,7 +826,7 @@ * @brief Find pre word in m_words2 (starting at bw2) that matches needword1 (in m_words1) */ int -stringdiffs::FindPreMatchInWords(std::vector<word*> words, const word & needword, int bw, int side) const +stringdiffs::FindPreMatchInWords(const std::vector<word*> &words, const word & needword, int bw, int side) const { while (bw >= 0) { @@ -847,7 +847,7 @@ * @brief Find next word in words (starting at bw) that matches needword1 (in m_words1) */ int -stringdiffs::FindNextMatchInWords(std::vector<word*> words, const word & needword, int bw, int side) const +stringdiffs::FindNextMatchInWords(const std::vector<word*> &words, const word & needword, int bw, int side) const { const int iSize = (int) words.size(); while (bw < iSize) @@ -870,7 +870,7 @@ * @brief Find pre space in m_words (starting at bw) */ int -stringdiffs::FindPreSpaceInWords(std::vector<word*> words, int bw) const +stringdiffs::FindPreSpaceInWords(const std::vector<word*> &words, int bw) const { while (bw >= 0) { @@ -885,7 +885,7 @@ * @brief Find next space in m_words (starting at bw) */ int -stringdiffs::FindNextSpaceInWords(std::vector<word*> words, int bw) const +stringdiffs::FindNextSpaceInWords(const std::vector<word*> &words, int bw) const { const int iSize = (int) words.size(); while (bw < iSize) @@ -900,7 +900,7 @@ * @brief Find next pre noinsert in words (starting at bw) */ int -stringdiffs::FindPreNoInsertInWords(std::vector<word*> words, int bw) const +stringdiffs::FindPreNoInsertInWords(const std::vector<word*> &words, int bw) const { while (bw >= 0) { @@ -914,7 +914,7 @@ * @brief Find next insert in m_words (starting at bw) */ int -stringdiffs::FindNextInsertInWords(std::vector<word*> words, int bw) const +stringdiffs::FindNextInsertInWords(const std::vector<word*> &words, int bw) const { const int iSize = (int) words.size(); while (bw < iSize) @@ -929,7 +929,7 @@ * @brief Find next noinsert in m_words (starting at bw) */ int -stringdiffs::FindNextNoInsertInWords(std::vector<word*> words, int bw) const +stringdiffs::FindNextNoInsertInWords(const std::vector<word*> &words, int bw) const { const int iSize = (int) words.size(); while (bw < iSize) Modified: trunk/Src/stringdiffsi.h =================================================================== --- trunk/Src/stringdiffsi.h 2010-10-24 07:57:15 UTC (rev 7348) +++ trunk/Src/stringdiffsi.h 2010-10-24 11:59:07 UTC (rev 7349) @@ -65,13 +65,13 @@ void BuildWordsArray(const String & str, std::vector<word*> * words); void InsertInWords(std::vector<word*> &words, int bw); - int FindPreMatchInWords(std::vector<word*> words,const word & needword, int bw, int side) const; - int FindNextMatchInWords(std::vector<word*> words,const word & needword, int bw, int side) const; - int FindPreSpaceInWords(std::vector<word*> words, int bw) const; - int FindNextSpaceInWords(std::vector<word*> words, int bw) const; - int FindPreNoInsertInWords(std::vector<word*> words, int bw) const; - int FindNextInsertInWords(std::vector<word*> words, int bw) const; - int FindNextNoInsertInWords(std::vector<word*> words, int bw) const; + int FindPreMatchInWords(const std::vector<word*> &words,const word & needword, int bw, int side) const; + int FindNextMatchInWords(const std::vector<word*> &words,const word & needword, int bw, int side) const; + int FindPreSpaceInWords(const std::vector<word*> &words, int bw) const; + int FindNextSpaceInWords(const std::vector<word*> &words, int bw) const; + int FindPreNoInsertInWords(const std::vector<word*> &words, int bw) const; + int FindNextInsertInWords(const std::vector<word*> &words, int bw) const; + int FindNextNoInsertInWords(const std::vector<word*> &words, int bw) const; void MoveInWordsUp(std::vector<word*> &words, int source, int target) const; void MoveInWordsDown(std::vector<word*> &words, int source, int target) const; UINT Hash(const String & str, int begin, int end, UINT h ) const; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-25 16:36:49
|
Revision: 7352 http://winmerge.svn.sourceforge.net/winmerge/?rev=7352&view=rev Author: gerundt Date: 2010-10-25 16:36:42 +0000 (Mon, 25 Oct 2010) Log Message: ----------- PATCH: [ 3093207 ] Delete dllver files Modified Paths: -------------- trunk/Src/Merge.vcproj Removed Paths: ------------- trunk/Src/dllver.cpp trunk/Src/dllver.h Modified: trunk/Src/Merge.vcproj =================================================================== --- trunk/Src/Merge.vcproj 2010-10-25 08:12:00 UTC (rev 7351) +++ trunk/Src/Merge.vcproj 2010-10-25 16:36:42 UTC (rev 7352) @@ -2607,52 +2607,6 @@ </FileConfiguration> </File> <File - RelativePath="dllver.cpp" - > - <FileConfiguration - Name="UnicodeRelease|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="UnicodeDebug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File RelativePath="EditorFilepathBar.cpp" > <FileConfiguration @@ -7984,10 +7938,6 @@ > </File> <File - RelativePath="dllver.h" - > - </File> - <File RelativePath="EditorFilepathBar.h" > </File> Deleted: trunk/Src/dllver.cpp =================================================================== --- trunk/Src/dllver.cpp 2010-10-25 08:12:00 UTC (rev 7351) +++ trunk/Src/dllver.cpp 2010-10-25 16:36:42 UTC (rev 7352) @@ -1,103 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// dllver.cpp : implementation of version check for any DLL -// - -#include "stdafx.h" -// Uses MFC C++ template collection classes -#include <afxtempl.h> -// Need DLLGETVERSIONPROC from <shlwapi.h> -#include <shlwapi.h> -#include "dllver.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -static CMap<CString, LPCTSTR, long, long> f_cache; - - -// Return major/minor version number from version resource (0 if not found) -DWORD getFixedModuleVersion(HMODULE hmod) -{ - // Do current exe if module not specified - if (!hmod) - hmod = ::GetModuleHandle(NULL); - TCHAR filepath[MAX_PATH]; - if (!GetModuleFileName(hmod, filepath, sizeof(filepath))) - return 0; - DWORD dwDummyHandle; - DWORD len = GetFileVersionInfoSize(filepath, &dwDummyHandle); - CString sbuf; - LPTSTR tbuff = sbuf.GetBuffer(len/sizeof(TCHAR)); - BYTE * buf = reinterpret_cast<BYTE *>(tbuff); - if (!::GetFileVersionInfo(filepath, 0, len, buf)) - return 0; - unsigned int verlen; - LPVOID lpvi; - if (!::VerQueryValue(buf, _T("\\"), &lpvi, &verlen)) - return 0; - VS_FIXEDFILEINFO fileInfo; - fileInfo = *(VS_FIXEDFILEINFO*)lpvi; - DWORD ver = fileInfo.dwFileVersionMS; - return ver; -} - -// Load dll & return its major/minor version number -DWORD GetDllVersion_Raw(LPCTSTR lpszDllName) -{ - - HINSTANCE hinstDll; - DWORD dwVersion = 0; - - Library lib; - if (!lib.Load(lpszDllName)) - return 0; - hinstDll = lib.Inst(); - - DLLGETVERSIONPROC pDllGetVersion; - - pDllGetVersion = (DLLGETVERSIONPROC) GetProcAddress(hinstDll, "DllGetVersion"); - -/*Because some DLLs might not implement this function, you - must test for it explicitly. Depending on the particular - DLL, the lack of a DllGetVersion function can be a useful - indicator of the version. -*/ - if (pDllGetVersion) - { - DLLVERSIONINFO dvi; - HRESULT hr; - - ZeroMemory(&dvi, sizeof(dvi)); - dvi.cbSize = sizeof(dvi); - - hr = (*pDllGetVersion)(&dvi); - - if(SUCCEEDED(hr)) - { - dwVersion = PACKVERSION(dvi.dwMajorVersion, dvi.dwMinorVersion); - return dwVersion; - - } - } - // Fall back to the version resource - dwVersion = getFixedModuleVersion(lib.Inst()); - - return dwVersion; -} - -// Return dll's version number -// Use cache if figured it out before -DWORD GetDllVersion(LPCTSTR lpszDllName) -{ - LONG ver=0; - if (!f_cache.Lookup(lpszDllName, ver)) - { - ver = GetDllVersion_Raw(lpszDllName); - f_cache[lpszDllName] = ver; - } - return ver; -} - Deleted: trunk/Src/dllver.h =================================================================== --- trunk/Src/dllver.h 2010-10-25 08:12:00 UTC (rev 7351) +++ trunk/Src/dllver.h 2010-10-25 16:36:42 UTC (rev 7352) @@ -1,37 +0,0 @@ -#ifndef dllver_h_included -#define dllver_h_included - -#ifndef PACKVERSION -#define PACKVERSION(major,minor) MAKELONG(minor,major) -#endif - -// resource pattern for APIs LoadLibrary, FreeLibrary -struct Library -{ - Library() : m_hinst(0) { } - ~Library() { Unload(); } - bool Load(LPCTSTR sz) - { - Unload(); - m_hinst = LoadLibrary(sz); - return m_hinst != NULL; - } - void Unload() - { - if (m_hinst) - { - FreeLibrary(m_hinst); - m_hinst = NULL; - } - } - HINSTANCE Inst() const { return m_hinst; } -protected: - HINSTANCE m_hinst; -}; - - -DWORD getFixedModuleVersion(HMODULE hmod); -DWORD GetDllVersion_Raw(LPCTSTR lpszDllName); // checks very time -DWORD GetDllVersion(LPCTSTR lpszDllName); // checks once & caches - -#endif // dllver_h_included \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-06 18:11:14
|
Revision: 7412 http://winmerge.svn.sourceforge.net/winmerge/?rev=7412&view=rev Author: gerundt Date: 2010-11-06 18:11:08 +0000 (Sat, 06 Nov 2010) Log Message: ----------- Disable patch #3026022 for WIN64 due to issues as per bug #3089575 Modified Paths: -------------- trunk/Src/Merge.cpp trunk/Src/MergeX64.vcproj Modified: trunk/Src/Merge.cpp =================================================================== --- trunk/Src/Merge.cpp 2010-11-06 14:48:59 UTC (rev 7411) +++ trunk/Src/Merge.cpp 2010-11-06 18:11:08 UTC (rev 7412) @@ -72,7 +72,7 @@ /** @brief Location for command line help to open. */ static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html"); - +#ifndef WIN64 /** * @brief Turn STL exceptions into MFC exceptions. * Based on the article "Visual C++ Exception-Handling Instrumentation" @@ -128,6 +128,7 @@ RaiseException(CPP_EXCEPTION, EXCEPTION_NONCONTINUABLE, _countof(args), args); } } +#endif ///////////////////////////////////////////////////////////////////////////// // CMergeApp Modified: trunk/Src/MergeX64.vcproj =================================================================== --- trunk/Src/MergeX64.vcproj 2010-11-06 14:48:59 UTC (rev 7411) +++ trunk/Src/MergeX64.vcproj 2010-11-06 18:11:08 UTC (rev 7412) @@ -55,7 +55,7 @@ Optimization="1" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" - PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_STATIC_CPPLIB" + PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -155,7 +155,7 @@ Optimization="1" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" - PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_STATIC_CPPLIB" + PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -253,7 +253,7 @@ AdditionalOptions="/EHa " Optimization="0" AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_STATIC_CPPLIB" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="3" RuntimeTypeInfo="true" UsePrecompiledHeader="2" @@ -349,7 +349,7 @@ AdditionalOptions="/EHa " Optimization="0" AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_STATIC_CPPLIB" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE" RuntimeLibrary="3" RuntimeTypeInfo="true" UsePrecompiledHeader="2" @@ -701,7 +701,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -711,7 +711,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -2035,7 +2035,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -2045,7 +2045,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -2081,7 +2081,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -2091,7 +2091,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -2275,7 +2275,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -2285,7 +2285,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -3739,7 +3739,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -3749,7 +3749,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -3881,7 +3881,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -3891,7 +3891,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -4061,7 +4061,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -4071,7 +4071,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -4479,7 +4479,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -4489,7 +4489,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -5469,7 +5469,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -5479,7 +5479,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -5657,7 +5657,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -5667,7 +5667,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -6199,7 +6199,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -6209,7 +6209,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -6383,7 +6383,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" UsePrecompiledHeader="1" /> </FileConfiguration> @@ -6394,7 +6394,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" UsePrecompiledHeader="1" /> </FileConfiguration> @@ -7215,7 +7215,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration @@ -7225,7 +7225,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="" + PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" /> </FileConfiguration> <FileConfiguration This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-20 11:52:50
|
Revision: 7433 http://winmerge.svn.sourceforge.net/winmerge/?rev=7433&view=rev Author: gerundt Date: 2010-11-20 11:52:43 +0000 (Sat, 20 Nov 2010) Log Message: ----------- PATCH: [ 3104374 ] Drop UNICODE preprocessor definition Modified Paths: -------------- trunk/Src/AnsiConvert.cpp trunk/Src/BCMenu.cpp trunk/Src/BCMenu.h trunk/Src/Common/Ucs2Utf8.cpp trunk/Src/Common/unicoder.cpp trunk/Src/Common/unicoder.h trunk/Src/ConfigLog.cpp trunk/Src/DiffWrapper.cpp trunk/Src/DirDoc.cpp trunk/Src/DirViewColItems.cpp trunk/Src/FileFilterHelper.cpp trunk/Src/Merge2.rc trunk/Src/StdAfx.cpp trunk/Src/ViewableWhitespace.cpp trunk/Src/editlib/ccrystaltextview.cpp trunk/Src/stringdiffs.cpp Modified: trunk/Src/AnsiConvert.cpp =================================================================== --- trunk/Src/AnsiConvert.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/AnsiConvert.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -46,9 +46,6 @@ */ LPCSTR convert(LPCTSTR str, UINT codepage) { -#ifndef UNICODE - return _strdup(str); -#else int len = WideCharToMultiByte(codepage, 0, str, -1, 0, 0, 0, 0); if (len) { @@ -57,5 +54,4 @@ return ansi; } return NULL; -#endif } Modified: trunk/Src/BCMenu.cpp =================================================================== --- trunk/Src/BCMenu.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/BCMenu.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -129,12 +129,7 @@ CString strText; if (m_szMenuText) { -#ifdef UNICODE strText = m_szMenuText; -#else - USES_CONVERSION; - strText=W2A(m_szMenuText); //SK: see MFC Tech Note 059 -#endif } return strText; } @@ -989,18 +984,6 @@ if (Win32s!=g_Shell) VERIFY(::GetTextExtentPoint32W(pDC->m_hDC,lpstrText, wcslen(lpstrText),&size)); //SK should also work on 95 -#ifndef UNICODE //can't be UNICODE for Win32s - else{//it's Win32suckx - RECT rect; - rect.left=rect.top=0; - size.cy=DrawText(pDC->m_hDC,(LPCTSTR)lpstrText, - wcslen(lpstrText),&rect, - DT_SINGLELINE|DT_LEFT|DT_VCENTER|DT_CALCRECT); - //+3 makes at least three pixels space to the menu border - size.cx=rect.right-rect.left+3; - size.cx += 3*(size.cx/wcslen(lpstrText)); - } -#endif CSize t = CSize(size); if(IsNewShell()) @@ -1474,11 +1457,7 @@ mdata = new BCMenuData; mdata->menuIconNormal = -1; mdata->xoffset=-1; -#ifdef UNICODE mdata->SetWideString((LPCTSTR)string);//SK: modified for dynamic allocation -#else - mdata->SetAnsiString(string); -#endif mdata->nFlags = nFlags; mdata->nID = nID; @@ -1900,11 +1879,7 @@ t=pDC->GetTextExtent(lpstrText,(int)_tcslen(lpstrText)); } newstring+=string.Mid(j); -#ifdef UNICODE m_MenuList[i]->SetWideString(newstring);//SK: modified for dynamic allocation -#else - m_MenuList[i]->SetAnsiString(newstring); -#endif } } pDC->SelectObject (pFont); // Select old font in @@ -2045,11 +2020,7 @@ if(!mdata)mdata=NewODMenu(j, (state&0xFF)|MF_BYPOSITION|MF_POPUP|MF_OWNERDRAW,submenu,string); else if(string.GetLength()>0) -#ifdef UNICODE mdata->SetWideString(string); //SK: modified for dynamic allocation -#else - mdata->SetAnsiString(string); -#endif } else if(state&MF_SEPARATOR){ mdata=FindMenuList(0); @@ -2066,11 +2037,7 @@ else{ mdata->nFlags=state|MF_BYPOSITION|MF_OWNERDRAW; if(string.GetLength()>0) -#ifdef UNICODE mdata->SetWideString(string);//SK: modified for dynamic allocation -#else - mdata->SetAnsiString(string); -#endif ModifyMenu(j,mdata->nFlags,nID,(LPCTSTR)mdata); } @@ -3041,11 +3008,7 @@ { INT_PTR numMenuItems = m_MenuList.GetUpperBound(); if(id<=numMenuItems){ -#ifdef UNICODE m_MenuList[id]->SetWideString((LPCTSTR)string); -#else - m_MenuList[id]->SetAnsiString(string); -#endif returnflag=TRUE; } } Modified: trunk/Src/BCMenu.h =================================================================== --- trunk/Src/BCMenu.h 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/BCMenu.h 2010-11-20 11:52:43 UTC (rev 7433) @@ -50,11 +50,7 @@ //struct CMenuItemInfo : public MENUITEMINFO { struct CMenuItemInfo : public //MENUITEMINFO -#ifndef UNICODE //SK: this fixes warning C4097: typedef-name 'MENUITEMINFO' used as synonym for class-name 'tagMENUITEMINFOA' -tagMENUITEMINFOA -#else tagMENUITEMINFOW -#endif { CMenuItemInfo() { @@ -70,15 +66,6 @@ typedef enum {BCMENU_NONE, BCMENU_HEAD, BCMENU_TAIL, BCMENU_BOTH} BC_Seperator; // defines for unicode support -#ifndef UNICODE -#define AppendMenu AppendMenuA -#define InsertMenu InsertMenuA -#define InsertODMenu InsertODMenuA -#define AppendODMenu AppendODMenuA -#define AppendODPopupMenu AppendODPopupMenuA -#define ModifyODMenu ModifyODMenuA -#define SetImageForPopupFromToolbar SetImageForPopupFromToolbarA -#else #define AppendMenu AppendMenuW #define InsertMenu InsertMenuW #define InsertODMenu InsertODMenuW @@ -86,7 +73,6 @@ #define ModifyODMenu ModifyODMenuW #define AppendODPopupMenu AppendODPopupMenuW #define SetImageForPopupFromToolbar SetImageForPopupFromToolbarW -#endif class BCMenu : public CMenu Modified: trunk/Src/Common/Ucs2Utf8.cpp =================================================================== --- trunk/Src/Common/Ucs2Utf8.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/Common/Ucs2Utf8.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -102,7 +102,6 @@ */ char * UCS2UTF8_ConvertToUtf8(LPCTSTR strOrigin) { -#ifdef UNICODE // Get the size of UTF-8 string int str_len = TransformUcs2ToUtf8(strOrigin, _tcslen(strOrigin), NULL, 0); ++str_len; // Space for zero at end @@ -110,9 +109,6 @@ char * str_utf = (char *) malloc(str_len); ZeroMemory(str_utf, str_len); str_len = TransformUcs2ToUtf8(strOrigin, _tcslen(strOrigin), str_utf, str_len); -#else - char *str_utf = strdup(strOrigin); -#endif return str_utf; } Modified: trunk/Src/Common/unicoder.cpp =================================================================== --- trunk/Src/Common/unicoder.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/Common/unicoder.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -489,7 +489,6 @@ if (codepage == -1) codepage = defcodepage; -#ifdef UNICODE // Convert input to Unicode, using specified codepage // TCHAR is wchar_t, so convert into String (str) DWORD flags = MB_ERR_INVALID_CHARS; @@ -543,39 +542,9 @@ while (flags == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION); str = _T('?'); return true; - -#else - if (EqualCodepages(codepage, defcodepage)) - { - // trivial case, they want the bytes in the file interpreted in our current codepage - // Only caveat is that input (lpd) is not zero-terminated - str = String(lpd, len); - return true; - } - - str = CrossConvertToStringA(lpd, len, codepage, defcodepage, lossy); - return true; -#endif } /** - * @brief (ANSI build only) Convert from one 8 bit codepage to another - */ -#ifndef UNICODE -String CrossConvertToStringA(const char* src, unsigned int srclen, int cpin, int cpout, bool * lossy) -{ - int wlen = srclen * 2 + 6; - int clen = wlen * 2 + 6; - String str; - str.resize(clen); - char* cbuff = &*str.begin(); - int nbytes = CrossConvert(src, srclen, cbuff, clen, cpin, cpout, lossy); - str.resize(nbytes); - return str; -} -#endif - -/** * @brief Convert from one 8-bit codepage to another * * destsize must be at least 2 Modified: trunk/Src/Common/unicoder.h =================================================================== --- trunk/Src/Common/unicoder.h 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/Common/unicoder.h 2010-11-20 11:52:43 UTC (rev 7433) @@ -63,9 +63,6 @@ bool convert(UNICODESET unicoding1, int codepage1, const unsigned char * src, int srcbytes, UNICODESET unicoding2, int codepage2, buffer * dest); int CrossConvert(const char* src, unsigned int srclen, char* dest, unsigned int destsize, int cpin, int cpout, bool * lossy); -#ifndef UNICODE -String CrossConvertToStringA(const char* src, unsigned int srclen, int cpin, int cpout, bool * lossy); -#endif UNICODESET DetermineEncoding(PBYTE pBuffer, INT64 size, bool * pBom); Modified: trunk/Src/ConfigLog.cpp =================================================================== --- trunk/Src/ConfigLog.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/ConfigLog.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -528,9 +528,6 @@ FileWriteString(_T(" codepage settings:\r\n")); WriteItem(2, _T("ANSI codepage"), GetACP()); WriteItem(2, _T("OEM codepage"), GetOEMCP()); -#ifndef UNICODE - WriteItem(2, _T("multibyte codepage"), _getmbcp()); -#endif WriteLocaleSettings(GetThreadLocale(), _T("Locale (Thread)")); WriteLocaleSettings(LOCALE_USER_DEFAULT, _T("Locale (User)")); WriteLocaleSettings(LOCALE_SYSTEM_DEFAULT, _T("Locale (System)")); Modified: trunk/Src/DiffWrapper.cpp =================================================================== --- trunk/Src/DiffWrapper.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/DiffWrapper.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -1353,14 +1353,8 @@ char * regexp_str; FilterList::EncodingType type; -#ifdef UNICODE regexp_str = UCS2UTF8_ConvertToUtf8(filterStr); type = FilterList::ENC_UTF8; -#else - CString tmp_str(filterStr); - regexp_str = tmp_str.LockBuffer(); - type = FilterList::ENC_ANSI; -#endif // Add every "line" of regexps to regexp list char * token; @@ -1371,11 +1365,7 @@ m_pFilterList->AddRegExp(token, type); token = strtok(NULL, sep); } -#ifdef UNICODE UCS2UTF8_Dealloc(regexp_str); -#else - tmp_str.UnlockBuffer(); -#endif } /** Modified: trunk/Src/DirDoc.cpp =================================================================== --- trunk/Src/DirDoc.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/DirDoc.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -295,19 +295,12 @@ char * regexp_str; FilterList::EncodingType type; -#ifdef UNICODE regexp_str = UCS2UTF8_ConvertToUtf8(filters.c_str()); type = FilterList::ENC_UTF8; -#else - regexp_str = (char *) filters.c_str(); - type = FilterList::ENC_ANSI; -#endif m_pCtxt->m_pFilterList->AddRegExp(regexp_str, type); -#ifdef UNICODE UCS2UTF8_Dealloc(regexp_str); -#endif } /** Modified: trunk/Src/DirViewColItems.cpp =================================================================== --- trunk/Src/DirViewColItems.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/DirViewColItems.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -23,11 +23,7 @@ #include "coretools.h" // shlwapi.h prior to VC6SP6 might lack definition of StrIsIntlEqual -#ifdef UNICODE #define StrIsIntlEqual StrIsIntlEqualW -#else -#define StrIsIntlEqual StrIsIntlEqualA -#endif #ifdef _DEBUG #define new DEBUG_NEW Modified: trunk/Src/FileFilterHelper.cpp =================================================================== --- trunk/Src/FileFilterHelper.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/FileFilterHelper.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -211,20 +211,13 @@ char * regexp_str; FilterList::EncodingType type; -#ifdef UNICODE regexp_str = UCS2UTF8_ConvertToUtf8(regExp.c_str()); type = FilterList::ENC_UTF8; -#else - regexp_str = &*regExp.begin(); - type = FilterList::ENC_ANSI; -#endif m_pMaskFilter->RemoveAllFilters(); m_pMaskFilter->AddRegExp(regexp_str, type); -#ifdef UNICODE UCS2UTF8_Dealloc(regexp_str); -#endif } /** Modified: trunk/Src/Merge2.rc =================================================================== --- trunk/Src/Merge2.rc 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/Merge2.rc 2010-11-20 11:52:43 UTC (rev 7433) @@ -5,11 +5,7 @@ // Include the manifest file for VC6 and VS2003.Net #if _MSC_VER < 1400 - #ifdef UNICODE - CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest" - #else - CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMerge.exe.manifest" - #endif + CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\WinMergeU.exe.manifest" #endif // MSC_VER Modified: trunk/Src/StdAfx.cpp =================================================================== --- trunk/Src/StdAfx.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/StdAfx.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -164,11 +164,7 @@ */ bool IsUnicodeBuild() { -#ifdef UNICODE return true; -#else - return false; -#endif } #if _MSC_VER <= 1310 Modified: trunk/Src/ViewableWhitespace.cpp =================================================================== --- trunk/Src/ViewableWhitespace.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/ViewableWhitespace.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -12,7 +12,6 @@ /** @brief Is structure initialized? */ static bool f_initialized = false; -#ifdef UNICODE // For UNICODE build, there is just one set which is always used // tab, space, cr, lf, eol @@ -44,66 +43,7 @@ f_initialized = true; } -#else -// For ANSI build, there are various sets for different codepages -static CMap<int, int, int, int> f_offset; // map codepage to offset - -// tab, space, cr, lf, eol -/** @brief Structure for whitespace characters. - * Char order is tab, space, cr, lf, eol. - */ -static struct ViewableWhitespaceChars - f_specialChars[] = { - { 0, ">", ".", "$", "!", "&" } // default all-ASCII for unhandled codepages - , { 850, "\xAF", "\xFA", "\xF5", "\xF4", "\xCF" } // CP-850 MSDOS Multilingual - - // CP-932 Windows version of Japanese ShiftJIS - // \x81\x98 = u+A7 - // \x81\xF7 = u+B6 - , { 932, ">", ".", "\x81\x98", "\x81\xF7", "&" } // CP-932 Japanese - - // CP-949 Korean - // \xA1\xA4 = u+B7 - // \xA1\xD7 = u+A7 - // \xA2\xD2 = u+B6 - // \xA2\xB4 = u+A4 - , { 949, ">", "\xA1\xA4", "\xA1\xD7", "\xA2\xD2", "\xA2\xB4" } // CP-949 Korean - - // CP-950 Windows version of Big5 Chinese Traditional - // \xA1\x6D = u+300A - // \xA1\x50 = u+B7 - // \xA1\xB1 = u+A7 - // \xA2\x54 = ? - // \xA1\x3B = u+33A1 - , { 951, "\xA1\x6D", "\xA1\x50", "\xA1\xB1", "\xA2\x54", "\xA1\x3B" } // CP-950 Chinese Traditional - - , { 1250, "\xBB", "\xB7", "\xA7", "\xB6", "\xA4" } // CP-1250 Central Europe - , { 1251, "\xBB", "\xB7", "\xA7", "\xB6", "\xA4" } // CP-1251 Windows Cyrillic - , { 1252, "\xBB", "\xB7", "\xA7", "\xB6", "\xA4" } // CP-1252 Western Europe - , { 1253, "\xBB", "\xB7", "\xA7", "\xB6", "\xA4" } // CP-1253 Windows Greek - , { 1254, "\xBB", "\xB7", "\xA7", "\xB6", "\xA4" } // CP-1254 Windows Turkish - , { 1255, "\xBB", "\xB7", "\xA7", "\xB6", "\xA5" } // CP-1255 Windows Hebrew - , { 1256, "\xBB", "\xB7", "\xA7", "\xB6", "\xA4" } // CP-1256 Windows Arabic - , { 1257, "\xBB", "\xB7", "\xA7", "\xB6", "\xA4" } // CP-1257 Windows Baltic Rim -}; - /** - * @brief Initialize whitespace chars structure. - */ -static void initialize() -{ - for (int i=0; i<sizeof(f_specialChars)/sizeof(f_specialChars[0]); ++i) - { - int codepage = f_specialChars[i].c_codepage; - f_offset[codepage] = i; - } - - f_initialized = true; -} - -#endif - -/** * @brief Return viewable whitespace chars. * @param [in] codepage Used codepage (only efective in ANSI builds). * @return Pointer to structure having viewable chars. @@ -112,15 +52,5 @@ { if (!f_initialized) initialize(); -#ifdef UNICODE return &f_specialChars; -#else - // Use the [0] version by default, if lookup fails to find a better one - int offset = 0; - if (f_offset.Lookup(codepage, offset)) - { - int d=9; - } - return &f_specialChars[offset]; -#endif } Modified: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/editlib/ccrystaltextview.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -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 } /** @@ -2397,11 +2389,7 @@ /** Does character introduce a multicharacter character? */ static inline bool IsLeadByte(TCHAR ch) { -#ifdef UNICODE return false; -#else - return _getmbcp() && IsDBCSLeadByte(ch); -#endif } int CCrystalTextView::CursorPointToCharPos( int nLineIndex, const CPoint &curPoint ) @@ -4538,13 +4526,8 @@ if (result >= 0) { -#ifdef UNICODE pos = ucr::stringlen_of_utf8(compString, ovector[0]); nLen = ucr::stringlen_of_utf8(compString, ovector[1]) - pos; -#else - pos = ovector[0]; - nLen = ovector[1] - ovector[0]; -#endif } else pos = -1; Modified: trunk/Src/stringdiffs.cpp =================================================================== --- trunk/Src/stringdiffs.cpp 2010-11-18 14:16:08 UTC (rev 7432) +++ trunk/Src/stringdiffs.cpp 2010-11-20 11:52:43 UTC (rev 7433) @@ -1216,11 +1216,7 @@ /** Does character introduce a multicharacter character? */ static inline bool IsLeadByte(TCHAR ch) { -#ifdef UNICODE return false; -#else - return _getmbcp() && IsDBCSLeadByte(ch); -#endif } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-22 12:43:11
|
Revision: 7441 http://winmerge.svn.sourceforge.net/winmerge/?rev=7441&view=rev Author: gerundt Date: 2010-11-22 12:43:03 +0000 (Mon, 22 Nov 2010) Log Message: ----------- PATCH: [ 3114577 ] Drop IsUnicodeBuild() function Modified Paths: -------------- trunk/Src/MainFrm.cpp trunk/Src/StdAfx.cpp trunk/Src/StdAfx.h Modified: trunk/Src/MainFrm.cpp =================================================================== --- trunk/Src/MainFrm.cpp 2010-11-21 17:42:49 UTC (rev 7440) +++ trunk/Src/MainFrm.cpp 2010-11-22 12:43:03 UTC (rev 7441) @@ -722,49 +722,6 @@ FileLocationGuessEncodings(filelocRight, bGuessEncoding); } - if (!IsUnicodeBuild()) - { - // In ANSI (8-bit) build, character loss can occur in merging - // if the two buffers use different encodings - if (filelocLeft.encoding.m_unicoding == ucr::NONE - && filelocRight.encoding.m_unicoding == ucr::NONE - && filelocLeft.encoding.m_codepage != filelocRight.encoding.m_codepage) - { - CString msg; - msg.Format(theApp.LoadString(IDS_SUGGEST_IGNORECODEPAGE).c_str(), filelocLeft.encoding.m_codepage, filelocRight.encoding.m_codepage); - int msgflags = MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN; - // Two files with different codepages - // Warn and propose to use the default codepage for both - int userChoice = AfxMessageBox(msg, msgflags); - if (userChoice == IDYES) - { - if (filelocLeft.encoding.m_codepage != getDefaultCodepage()) - { - filelocLeft.encoding.SetCodepage(getDefaultCodepage()); - filelocLeft.encoding.m_bom = false; - filelocLeft.encoding.m_guessed = false; - } - if (filelocRight.encoding.m_codepage != getDefaultCodepage()) - { - filelocRight.encoding.SetCodepage(getDefaultCodepage()); - filelocRight.encoding.m_bom = false; - filelocRight.encoding.m_guessed = false; - } - } - } - else if (filelocLeft.encoding.m_unicoding != filelocRight.encoding.m_unicoding) - { - String leftEncoding = filelocLeft.encoding.GetName(); - String rightEncoding = filelocRight.encoding.GetName(); - CString msg; - msg.Format(theApp.LoadString(IDS_DIFFERENT_UNICODINGS).c_str(), leftEncoding.c_str(), rightEncoding.c_str()); - int msgflags = MB_OK | MB_ICONWARNING | MB_DONT_ASK_AGAIN; - // Two files with different codepages - // Warn and propose to use the default codepage for both - AfxMessageBox(msg, msgflags); - } - } - // Note that OpenDocs() takes care of closing compare window when needed. BOOL bLeftRO = (dwLeftFlags & FFILEOPEN_READONLY) > 0; BOOL bRightRO = (dwRightFlags & FFILEOPEN_READONLY) > 0; Modified: trunk/Src/StdAfx.cpp =================================================================== --- trunk/Src/StdAfx.cpp 2010-11-21 17:42:49 UTC (rev 7440) +++ trunk/Src/StdAfx.cpp 2010-11-22 12:43:03 UTC (rev 7441) @@ -159,14 +159,6 @@ #endif // _UNICODE } -/** - * @brief Return true if Unicode (16-bit) build - */ -bool IsUnicodeBuild() -{ - return true; -} - #if _MSC_VER <= 1310 /** * @brief Calculates a number absolute value. Modified: trunk/Src/StdAfx.h =================================================================== --- trunk/Src/StdAfx.h 2010-11-21 17:42:49 UTC (rev 7440) +++ trunk/Src/StdAfx.h 2010-11-22 12:43:03 UTC (rev 7441) @@ -142,8 +142,6 @@ /** @brief Get appropriate clipboard format for TCHAR text, ie, CF_TEXT or CF_UNICODETEXT */ int GetClipTcharTextFormat(); -bool IsUnicodeBuild(); - /** @brief include for the custom dialog boxes, with do not ask/display again */ #include "MessageBoxDialog.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-24 07:57:32
|
Revision: 7446 http://winmerge.svn.sourceforge.net/winmerge/?rev=7446&view=rev Author: gerundt Date: 2010-11-24 07:57:25 +0000 (Wed, 24 Nov 2010) Log Message: ----------- PATCH: [ 3116407 ] Drop _UNICODE preprocessor definition Modified Paths: -------------- trunk/Src/AboutDlg.cpp trunk/Src/Common/SuperComboBox.cpp trunk/Src/Common/UniFile.cpp trunk/Src/Common/UnicodeString.h trunk/Src/Common/coretools.cpp trunk/Src/Common/string_util.cpp trunk/Src/Common/unicoder.cpp trunk/Src/ConfigLog.cpp trunk/Src/MainFrm.cpp trunk/Src/ProjectFile.cpp trunk/Src/PropCodepage.cpp trunk/Src/StdAfx.cpp trunk/Src/editlib/ccrystaltextbuffer.cpp trunk/Src/editlib/ccrystaltextview.cpp trunk/Src/editlib/ccrystaltextview.h trunk/Src/editlib/crystalparser.cpp trunk/Src/editlib/filesup.cpp trunk/Src/paths.cpp Modified: trunk/Src/AboutDlg.cpp =================================================================== --- trunk/Src/AboutDlg.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/AboutDlg.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -72,10 +72,8 @@ String sVersion = version.GetFixedProductVersion(); LangFormatString1(m_strVersion, IDS_VERSION_FMT, sVersion.c_str()); -#ifdef _UNICODE m_strVersion += _T(" "); m_strVersion += theApp.LoadString(IDS_UNICODE).c_str(); -#endif #ifdef WIN64 m_strVersion += _T(" "); Modified: trunk/Src/Common/SuperComboBox.cpp =================================================================== --- trunk/Src/Common/SuperComboBox.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/Common/SuperComboBox.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -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: trunk/Src/Common/UniFile.cpp =================================================================== --- trunk/Src/Common/UniFile.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/Common/UniFile.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -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 { size_t bytes = line.length() * sizeof(TCHAR); size_t wbytes = fwrite(line.c_str(), 1, bytes, m_fp); Modified: trunk/Src/Common/UnicodeString.h =================================================================== --- trunk/Src/Common/UnicodeString.h 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/Common/UnicodeString.h 2010-11-24 07:57:25 UTC (rev 7446) @@ -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: trunk/Src/Common/coretools.cpp =================================================================== --- trunk/Src/Common/coretools.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/Common/coretools.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -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: trunk/Src/Common/string_util.cpp =================================================================== --- trunk/Src/Common/string_util.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/Common/string_util.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -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: trunk/Src/Common/unicoder.cpp =================================================================== --- trunk/Src/Common/unicoder.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/Common/unicoder.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -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: trunk/Src/ConfigLog.cpp =================================================================== --- trunk/Src/ConfigLog.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/ConfigLog.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -394,20 +394,14 @@ paths_CreateIfNeeded(sFileName.c_str()); m_sFileName = paths_ConcatPath(sFileName, _T("WinMerge.txt")); -#ifdef _UNICODE if (!m_pfile->OpenCreateUtf8(m_sFileName.c_str())) -#else - if (!m_pfile->OpenCreate(m_sFileName.c_str())) -#endif { const UniFile::UniError &err = m_pfile->GetLastUniError(); sError = err.GetError(); return false; } -#ifdef _UNICODE m_pfile->SetBom(true); m_pfile->WriteBom(); -#endif } // Begin log Modified: trunk/Src/MainFrm.cpp =================================================================== --- trunk/Src/MainFrm.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/MainFrm.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -365,11 +365,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 @@ -3415,17 +3411,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: trunk/Src/ProjectFile.cpp =================================================================== --- trunk/Src/ProjectFile.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/ProjectFile.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -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 // Constants for xml element names const char Root_element_name[] = "project"; Modified: trunk/Src/PropCodepage.cpp =================================================================== --- trunk/Src/PropCodepage.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/PropCodepage.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -128,13 +128,8 @@ if (nCustomCodepageValue == 0) { char *result= new char[80]; -#ifdef _UNICODE long len = wcslen(m_cCustomCodepageValue); _wcstombsz(result, m_cCustomCodepageValue, len); //conversion to char * -#else - long len = m_cCustomCodepageValue.GetLength(); - strncpy(result, m_cCustomCodepageValue.GetBuffer(0), len); -#endif result[len] = '\0'; //don't forget to put the caracter of terminated string nCustomCodepageValue = GetEncodingCodePageFromName(result); delete [] result; Modified: trunk/Src/StdAfx.cpp =================================================================== --- trunk/Src/StdAfx.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/StdAfx.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -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: trunk/Src/editlib/ccrystaltextbuffer.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextbuffer.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -525,11 +525,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); @@ -1845,15 +1841,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:: @@ -1862,15 +1850,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: trunk/Src/editlib/ccrystaltextview.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/editlib/ccrystaltextview.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -1020,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; } @@ -1660,10 +1656,6 @@ bLastCharSpace = FALSE; nNonbreakChars++; } -#ifndef _UNICODE - if (IsDBCSLeadByte (ch)) - strHTML += strText[++i]; -#endif if ((nNonbreakChars % nScreenChars) == nScreenChars - 1) { strHTML += _T("<wbr>"); @@ -6002,7 +5994,6 @@ return m_pTextBuffer->GetLineEol(nLine); } -#ifdef _UNICODE int CCrystalTextView::GetCharWidthUnicodeChar(wchar_t ch) { if (!m_bChWidthsCalculated[ch/256]) @@ -6037,15 +6028,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: trunk/Src/editlib/ccrystaltextview.h =================================================================== --- trunk/Src/editlib/ccrystaltextview.h 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/editlib/ccrystaltextview.h 2010-11-24 07:57:25 UTC (rev 7446) @@ -465,11 +465,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: trunk/Src/editlib/crystalparser.cpp =================================================================== --- trunk/Src/editlib/crystalparser.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/editlib/crystalparser.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -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: trunk/Src/editlib/filesup.cpp =================================================================== --- trunk/Src/editlib/filesup.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/editlib/filesup.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -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: trunk/Src/paths.cpp =================================================================== --- trunk/Src/paths.cpp 2010-11-24 07:19:29 UTC (rev 7445) +++ trunk/Src/paths.cpp 2010-11-24 07:57:25 UTC (rev 7446) @@ -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. |
From: <ge...@us...> - 2010-12-06 06:55:54
|
Revision: 7451 http://winmerge.svn.sourceforge.net/winmerge/?rev=7451&view=rev Author: gerundt Date: 2010-12-06 06:55:47 +0000 (Mon, 06 Dec 2010) Log Message: ----------- PATCH: [ 3117406 ] Drop GetClipTcharTextFormat() function Modified Paths: -------------- trunk/Src/Common/ClipBoard.cpp trunk/Src/FilepathEdit.cpp trunk/Src/StdAfx.cpp trunk/Src/StdAfx.h trunk/Src/editlib/ccrystaleditview.cpp trunk/Src/editlib/ccrystaltextview2.cpp Modified: trunk/Src/Common/ClipBoard.cpp =================================================================== --- trunk/Src/Common/ClipBoard.cpp 2010-12-01 18:12:26 UTC (rev 7450) +++ trunk/Src/Common/ClipBoard.cpp 2010-12-06 06:55:47 UTC (rev 7451) @@ -31,8 +31,7 @@ LPTSTR pszData = (LPTSTR)::GlobalLock(hData); _tcscpy(pszData, text.c_str()); GlobalUnlock(hData); - UINT fmt = GetClipTcharTextFormat(); - bOK = SetClipboardData(fmt, hData) != NULL; + bOK = SetClipboardData(CF_UNICODETEXT, hData) != NULL; } CloseClipboard(); } @@ -50,8 +49,7 @@ bool bSuccess = false; if (OpenClipboard(currentWindowHandle)) { - UINT fmt = GetClipTcharTextFormat(); - HGLOBAL hData = GetClipboardData(fmt); + HGLOBAL hData = GetClipboardData(CF_UNICODETEXT); if (hData != NULL) { LPTSTR pszData = (LPTSTR) GlobalLock(hData); @@ -73,6 +71,5 @@ */ bool TextInClipboard() { - UINT fmt = GetClipTcharTextFormat(); - return IsClipboardFormatAvailable(fmt) != FALSE; + return IsClipboardFormatAvailable(CF_UNICODETEXT) != FALSE; } Modified: trunk/Src/FilepathEdit.cpp =================================================================== --- trunk/Src/FilepathEdit.cpp 2010-12-01 18:12:26 UTC (rev 7450) +++ trunk/Src/FilepathEdit.cpp 2010-12-06 06:55:47 UTC (rev 7451) @@ -241,9 +241,8 @@ // Copy selected data from m_sOriginalText into the alloc'd data area _tcscpy (pszData, (LPTSTR) m_sOriginalText.Mid(iBegin, iEnd - iBegin).GetBuffer(0)); GlobalUnlock (hData); - UINT fmt = GetClipTcharTextFormat(); // CF_TEXT or CF_UNICODETEXT // Using alloc'd data, set the clipboard - SetClipboardData (fmt, hData); + SetClipboardData (CF_UNICODETEXT, hData); // release the clipboard CloseClipboard (); Modified: trunk/Src/StdAfx.cpp =================================================================== --- trunk/Src/StdAfx.cpp 2010-12-01 18:12:26 UTC (rev 7450) +++ trunk/Src/StdAfx.cpp 2010-12-06 06:55:47 UTC (rev 7451) @@ -149,12 +149,6 @@ return str; } -// Get appropriate clipboard format for TCHAR text -int GetClipTcharTextFormat() -{ - return CF_UNICODETEXT; -} - #if _MSC_VER <= 1310 /** * @brief Calculates a number absolute value. Modified: trunk/Src/StdAfx.h =================================================================== --- trunk/Src/StdAfx.h 2010-12-01 18:12:26 UTC (rev 7450) +++ trunk/Src/StdAfx.h 2010-12-06 06:55:47 UTC (rev 7451) @@ -139,9 +139,6 @@ /** @brief Inline sprintf-style format; shortcut for CString::Format */ CString Fmt(LPCTSTR fmt, ...); - /** @brief Get appropriate clipboard format for TCHAR text, ie, CF_TEXT or CF_UNICODETEXT */ -int GetClipTcharTextFormat(); - /** @brief include for the custom dialog boxes, with do not ask/display again */ #include "MessageBoxDialog.h" Modified: trunk/Src/editlib/ccrystaleditview.cpp =================================================================== --- trunk/Src/editlib/ccrystaleditview.cpp 2010-12-01 18:12:26 UTC (rev 7450) +++ trunk/Src/editlib/ccrystaleditview.cpp 2010-12-06 06:55:47 UTC (rev 7451) @@ -964,8 +964,7 @@ DROPEFFECT CEditDropTargetImpl:: OnDragEnter (CWnd * pWnd, COleDataObject * pDataObject, DWORD dwKeyState, CPoint point) { - UINT fmt = GetClipTcharTextFormat(); - if (!pDataObject->IsDataAvailable (fmt)) + if (!pDataObject->IsDataAvailable (CF_UNICODETEXT)) { m_pOwner->HideDropIndicator (); return DROPEFFECT_NONE; @@ -1003,8 +1002,7 @@ // if ((pDataObject->IsDataAvailable( CF_TEXT ) ) || // If Text Available // ( pDataObject -> IsDataAvailable( xxx ) ) || // Or xxx Available // ( pDataObject -> IsDataAvailable( yyy ) ) ) // Or yyy Available - UINT fmt = GetClipTcharTextFormat(); // CF_TEXT or CF_UNICODETEXT - if (pDataObject->IsDataAvailable (fmt)) // If Text Available + if (pDataObject->IsDataAvailable (CF_UNICODETEXT)) // If Text Available { bDataSupported = true; // Set Flag @@ -1045,8 +1043,7 @@ // if( ( pDataObject -> IsDataAvailable( CF_TEXT ) ) || // If Text Available // ( pDataObject -> IsDataAvailable( xxx ) ) || // Or xxx Available // ( pDataObject -> IsDataAvailable( yyy ) ) ) // Or yyy Available - UINT fmt = GetClipTcharTextFormat(); // CF_TEXT or CF_UNICODETEXT - if (pDataObject->IsDataAvailable (fmt)) // If Text Available + if (pDataObject->IsDataAvailable (CF_UNICODETEXT)) // If Text Available { bDataSupported = true; // Set Flag @@ -1119,8 +1116,7 @@ BOOL CCrystalEditView:: DoDropText (COleDataObject * pDataObject, const CPoint & ptClient) { - UINT fmt = GetClipTcharTextFormat(); // CF_TEXT or CF_UNICODETEXT - HGLOBAL hData = pDataObject->GetGlobalData (fmt); + HGLOBAL hData = pDataObject->GetGlobalData (CF_UNICODETEXT); if (hData == NULL) return FALSE; Modified: trunk/Src/editlib/ccrystaltextview2.cpp =================================================================== --- trunk/Src/editlib/ccrystaltextview2.cpp 2010-12-01 18:12:26 UTC (rev 7450) +++ trunk/Src/editlib/ccrystaltextview2.cpp 2010-12-06 06:55:47 UTC (rev 7451) @@ -794,8 +794,7 @@ m_pTextBuffer->BeginUndoGroup (); COleDataSource ds; - UINT fmt = GetClipTcharTextFormat(); // CF_TEXT or CF_UNICODETEXT - ds.CacheGlobalData (fmt, hData); + ds.CacheGlobalData (CF_UNICODETEXT, hData); m_bDraggingText = TRUE; DROPEFFECT de = ds.DoDragDrop (GetDropEffect ()); if (de != DROPEFFECT_NONE) @@ -1118,8 +1117,7 @@ BOOL CCrystalTextView:: TextInClipboard () { - UINT fmt = GetClipTcharTextFormat(); - return IsClipboardFormatAvailable (fmt); + return IsClipboardFormatAvailable (CF_UNICODETEXT); } BOOL CCrystalTextView:: @@ -1142,8 +1140,7 @@ LPTSTR pszData = (LPTSTR)::GlobalLock (hData); memcpy (pszData, pszText, cbData); GlobalUnlock (hData); - UINT fmt = GetClipTcharTextFormat(); - bOK = SetClipboardData (fmt, hData) != NULL; + bOK = SetClipboardData (CF_UNICODETEXT, hData) != NULL; if (bOK) SetClipboardData (RegisterClipboardFormat (_T("WinMergeClipboard")), NULL); } @@ -1158,8 +1155,7 @@ BOOL bSuccess = FALSE; if (OpenClipboard ()) { - UINT fmt = GetClipTcharTextFormat(); - HGLOBAL hData = GetClipboardData (fmt); + HGLOBAL hData = GetClipboardData (CF_UNICODETEXT); if (hData != NULL) { LPTSTR pszData = (LPTSTR) GlobalLock (hData); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-12-07 20:45:16
|
Revision: 7468 http://winmerge.svn.sourceforge.net/winmerge/?rev=7468&view=rev Author: gerundt Date: 2010-12-07 20:45:10 +0000 (Tue, 07 Dec 2010) Log Message: ----------- Fix whitespace Modified Paths: -------------- trunk/Src/DirView.cpp trunk/Src/ProjectFile.cpp Modified: trunk/Src/DirView.cpp =================================================================== --- trunk/Src/DirView.cpp 2010-12-07 19:51:04 UTC (rev 7467) +++ trunk/Src/DirView.cpp 2010-12-07 20:45:10 UTC (rev 7468) @@ -3160,7 +3160,7 @@ if (!di.diffcode.isSideLeftOnly()) { - strPaths += di. GetRightFilepath(pDoc->GetRightBasePath()); + strPaths += di.GetRightFilepath(pDoc->GetRightBasePath()); // If item is a folder then subfolder (relative to base folder) // is in filename member. strPaths = paths_ConcatPath(strPaths, di.right.filename); Modified: trunk/Src/ProjectFile.cpp =================================================================== --- trunk/Src/ProjectFile.cpp 2010-12-07 19:51:04 UTC (rev 7467) +++ trunk/Src/ProjectFile.cpp 2010-12-07 20:45:10 UTC (rev 7468) @@ -41,8 +41,8 @@ #define UTF82A(lpu) W2A(UTF82W(lpu)) #define A2UTF8(lpa) W2UTF8(A2W(lpa)) -# define UTF82T(lpu) UTF82W(lpu) -# define T2UTF8(lpw) W2UTF8(lpw) +#define UTF82T(lpu) UTF82W(lpu) +#define T2UTF8(lpw) W2UTF8(lpw) // Constants for xml element names const char Root_element_name[] = "project"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2011-01-21 08:42:48
|
Revision: 7507 http://winmerge.svn.sourceforge.net/winmerge/?rev=7507&view=rev Author: gerundt Date: 2011-01-21 08:42:41 +0000 (Fri, 21 Jan 2011) Log Message: ----------- Fixing 64-bit build warnings. Modified Paths: -------------- trunk/Src/DirViewColItems.cpp trunk/Src/paths.cpp Modified: trunk/Src/DirViewColItems.cpp =================================================================== --- trunk/Src/DirViewColItems.cpp 2011-01-04 15:53:35 UTC (rev 7506) +++ trunk/Src/DirViewColItems.cpp 2011-01-21 08:42:41 UTC (rev 7507) @@ -219,15 +219,15 @@ return s; } - int i = 0, j = 0; + size_t i = 0, j = 0; do { - int i_ahead = s.find('\\', i); - int j_ahead = t.find('\\', j); - int length_s = (i_ahead != String::npos ? i_ahead : s.length()) - i; - int length_t = (j_ahead != String::npos ? j_ahead : t.length()) - j; + size_t i_ahead = s.find('\\', i); + size_t j_ahead = t.find('\\', j); + size_t length_s = (i_ahead != String::npos ? i_ahead : s.length()) - i; + size_t length_t = (j_ahead != String::npos ? j_ahead : t.length()) - j; if (length_s != length_t || - !StrIsIntlEqual(FALSE, s.c_str() + i, t.c_str() + j, length_s)) + !StrIsIntlEqual(FALSE, s.c_str() + i, t.c_str() + j, (int)length_s)) { String u(t.c_str() + j, length_t + 1); u[length_t] = '|'; Modified: trunk/Src/paths.cpp =================================================================== --- trunk/Src/paths.cpp 2011-01-04 15:53:35 UTC (rev 7506) +++ trunk/Src/paths.cpp 2011-01-21 08:42:41 UTC (rev 7507) @@ -38,8 +38,8 @@ */ bool paths_EndsWithSlash(LPCTSTR s) { - if (int len = _tcslen(s)) - return IsSlash(s, len - 1); + if (size_t len = _tcslen(s)) + return IsSlash(s, (int)len - 1); return false; } @@ -101,7 +101,7 @@ */ void paths_normalize(String & sPath) { - int len = sPath.length(); + size_t len = sPath.length(); if (!len) return; @@ -167,7 +167,7 @@ String paths_GetLongPath(LPCTSTR szPath, BOOL bExpandEnvs) { String sPath = szPath; - int len = sPath.length(); + size_t len = sPath.length(); if (len < 1) return sPath; @@ -492,7 +492,7 @@ String paths_GetParentPath(LPCTSTR path) { String parentPath(path); - int len = parentPath.length(); + size_t len = parentPath.length(); // Remove last '\' from paths if (parentPath[len - 1] == '\\') @@ -502,7 +502,7 @@ } // Remove last part of path - int pos = parentPath.rfind('\\'); + size_t pos = parentPath.rfind('\\'); if (pos > -1) { @@ -523,7 +523,7 @@ String paths_GetLastSubdir(const String & path) { String parentPath(path); - int len = parentPath.length(); + size_t len = parentPath.length(); // Remove last '\' from paths if (parentPath[len - 1] == '\\') @@ -533,7 +533,7 @@ } // Find last part of path - int pos = parentPath.find_last_of('\\'); + size_t pos = parentPath.find_last_of('\\'); if (pos >= 2) parentPath.erase(0, pos); return parentPath; @@ -549,7 +549,7 @@ if (path.length() < 3) return FALSE; - int pos = path.find_last_of('\\'); + size_t pos = path.find_last_of('\\'); // Absolute path must have "\" and cannot start with it. // Also "\\blahblah" is invalid. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2011-05-24 16:05:02
|
Revision: 7528 http://winmerge.svn.sourceforge.net/winmerge/?rev=7528&view=rev Author: sdottaka Date: 2011-05-24 16:04:55 +0000 (Tue, 24 May 2011) Log Message: ----------- Add missing .c_str() Modified Paths: -------------- trunk/Src/Common/OptionsMgr.cpp trunk/Src/PropShell.cpp trunk/Src/locality.cpp Modified: trunk/Src/Common/OptionsMgr.cpp =================================================================== --- trunk/Src/Common/OptionsMgr.cpp 2011-05-23 13:54:11 UTC (rev 7527) +++ trunk/Src/Common/OptionsMgr.cpp 2011-05-24 16:04:55 UTC (rev 7528) @@ -283,7 +283,7 @@ if (ConvertType(value, m_value.GetType())) return Set(value); } - _RPTF1(_CRT_ERROR, "Wrong type for option: %s", m_strName); + _RPTF1(_CRT_ERROR, "Wrong type for option: %s", m_strName.c_str()); return OPT_WRONG_TYPE; } @@ -329,7 +329,7 @@ varprop::VT_TYPE inType = defaultValue.GetType(); if (inType != m_valueDef.GetType()) { - _RPTF1(_CRT_ERROR, "Wrong type for option: %s!", m_strName); + _RPTF1(_CRT_ERROR, "Wrong type for option: %s!", m_strName.c_str()); return OPT_WRONG_TYPE; } Modified: trunk/Src/PropShell.cpp =================================================================== --- trunk/Src/PropShell.cpp 2011-05-23 13:54:11 UTC (rev 7527) +++ trunk/Src/PropShell.cpp 2011-05-24 16:04:55 UTC (rev 7528) @@ -103,7 +103,7 @@ { CString msg; msg.Format(_T("Failed to open registry key HKCU/%s:\n\t%d : %s"), - f_RegDir, retVal, GetSysError(retVal)); + f_RegDir, retVal, GetSysError(retVal).c_str()); LogErrorString(msg); return; } @@ -141,7 +141,7 @@ { CString msg; msg.Format(_T("Failed to open registry key HKCU/%s:\n\t%d : %s"), - f_RegDir, retVal, GetSysError(retVal)); + f_RegDir, retVal, GetSysError(retVal).c_str()); LogErrorString(msg); return; } @@ -152,7 +152,7 @@ { CString msg; msg.Format(_T("Failed to set registry value %s:\n\t%d : %s"), - f_RegValuePath, retVal, GetSysError(retVal)); + f_RegValuePath, retVal, GetSysError(retVal).c_str()); LogErrorString(msg); } @@ -178,7 +178,7 @@ { CString msg; msg.Format(_T("Failed to set registry value %s to %d:\n\t%d : %s"), - f_RegValueEnabled, dwContextEnabled, retVal, GetSysError(retVal)); + f_RegValueEnabled, dwContextEnabled, retVal, GetSysError(retVal).c_str()); LogErrorString(msg); } } Modified: trunk/Src/locality.cpp =================================================================== --- trunk/Src/locality.cpp 2011-05-23 13:54:11 UTC (rev 7527) +++ trunk/Src/locality.cpp 2011-05-24 16:04:55 UTC (rev 7528) @@ -114,7 +114,7 @@ else { int nerr = GetLastError(); - TRACE(_T("Error %d in NumToStr(): %s\n"), nerr, GetSysError(nerr)); + TRACE(_T("Error %d in NumToStr(): %s\n"), nerr, GetSysError(nerr).c_str()); out = str; } return out; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdo...@us...> - 2011-06-26 13:32:40
|
Revision: 7547 http://winmerge.svn.sourceforge.net/winmerge/?rev=7547&view=rev Author: sdottaka Date: 2011-06-26 13:32:34 +0000 (Sun, 26 Jun 2011) Log Message: ----------- PATCH: [3312576] Patch for bug #3102104 Modified Paths: -------------- trunk/Src/Common/varprop.cpp trunk/Src/DirActions.cpp trunk/Src/FilterCommentsManager.cpp trunk/Src/MergeDoc.cpp Modified: trunk/Src/Common/varprop.cpp =================================================================== --- trunk/Src/Common/varprop.cpp 2011-06-12 13:01:40 UTC (rev 7546) +++ trunk/Src/Common/varprop.cpp 2011-06-26 13:32:34 UTC (rev 7547) @@ -130,7 +130,7 @@ m_bvalue = false; m_ivalue = 0; m_fvalue = 0; - m_svalue.empty(); + m_svalue.erase(); m_tvalue = 0; } Modified: trunk/Src/DirActions.cpp =================================================================== --- trunk/Src/DirActions.cpp 2011-06-12 13:01:40 UTC (rev 7546) +++ trunk/Src/DirActions.cpp 2011-06-26 13:32:34 UTC (rev 7547) @@ -1304,8 +1304,8 @@ UINT_PTR diffpos = GetItemKey(sel); if (diffpos == (UINT_PTR)SPECIAL_ITEM_POS) { - strLeft.empty(); - strRight.empty(); + strLeft.erase(); + strRight.erase(); } else { Modified: trunk/Src/FilterCommentsManager.cpp =================================================================== --- trunk/Src/FilterCommentsManager.cpp 2011-06-12 13:01:40 UTC (rev 7546) +++ trunk/Src/FilterCommentsManager.cpp 2011-06-26 13:32:34 UTC (rev 7547) @@ -35,8 +35,6 @@ FilterCommentsManager::FilterCommentsManager(const TCHAR* IniFileName /*= _T("")*/) : m_IniFileName(IniFileName) { - USES_CONVERSION; - int SectionNo = 0; TCHAR SectionName[99]; TCHAR buffer[1024]; @@ -49,11 +47,11 @@ FilterCommentsSet filtercommentsset; _sntprintf(SectionName, sizeof(SectionName)/sizeof(SectionName[0]), _T("set%i"), SectionNo); GetPrivateProfileString(SectionName, _T("StartMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName.c_str()); - filtercommentsset.StartMarker = T2CA(buffer); + filtercommentsset.StartMarker = CStringA(buffer); GetPrivateProfileString(SectionName, _T("EndMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName.c_str()); - filtercommentsset.EndMarker = T2CA(buffer); + filtercommentsset.EndMarker = CStringA(buffer); GetPrivateProfileString(SectionName, _T("InlineMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName.c_str()); - filtercommentsset.InlineMarker = T2CA(buffer); + filtercommentsset.InlineMarker = CStringA(buffer); if (filtercommentsset.StartMarker.empty() && filtercommentsset.EndMarker.empty() && filtercommentsset.InlineMarker.empty()) Modified: trunk/Src/MergeDoc.cpp =================================================================== --- trunk/Src/MergeDoc.cpp 2011-06-12 13:01:40 UTC (rev 7546) +++ trunk/Src/MergeDoc.cpp 2011-06-26 13:32:34 UTC (rev 7547) @@ -1162,8 +1162,7 @@ nSaveErrorCode = SAVE_NO_FILENAME; // Handle unnamed buffers - if ((m_nBufferType[nBuffer] == BUFFER_UNNAMED) || - (m_nBufferType[nBuffer] == BUFFER_UNNAMED)) + if (m_nBufferType[nBuffer] == BUFFER_UNNAMED) nSaveErrorCode = SAVE_NO_FILENAME; String sError; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2013-03-06 23:23:18
|
Revision: 7601 http://sourceforge.net/p/winmerge/code/7601 Author: gerundt Date: 2013-03-06 23:23:15 +0000 (Wed, 06 Mar 2013) Log Message: ----------- Remove unused files Submitted by Takashi Sawanaka Modified Paths: -------------- trunk/Src/ConfigLog.cpp Removed Paths: ------------- trunk/Src/STACK.C trunk/Src/ssauto.h trunk/Src/winnt_supp.h Modified: trunk/Src/ConfigLog.cpp =================================================================== --- trunk/Src/ConfigLog.cpp 2013-03-06 22:57:49 UTC (rev 7600) +++ trunk/Src/ConfigLog.cpp 2013-03-06 23:23:15 UTC (rev 7601) @@ -28,7 +28,6 @@ #include "UniFile.h" #include "DiffWrapper.h" #include "ConfigLog.h" -#include "winnt_supp.h" #include "Plugins.h" #include "paths.h" #include "unicoder.h" Deleted: trunk/Src/STACK.C =================================================================== --- trunk/Src/STACK.C 2013-03-06 22:57:49 UTC (rev 7600) +++ trunk/Src/STACK.C 2013-03-06 23:23:15 UTC (rev 7601) @@ -1 +0,0 @@ -extern unsigned _stklen = 24*1024; Deleted: trunk/Src/ssauto.h =================================================================== --- trunk/Src/ssauto.h 2013-03-06 22:57:49 UTC (rev 7600) +++ trunk/Src/ssauto.h 2013-03-06 23:23:15 UTC (rev 7601) @@ -1,600 +0,0 @@ -/* This header file machine-generated by mktyplib.exe */ -/* Interface to type library: SourceSafeTypeLib */ - -#ifndef _SourceSafeTypeLib_H_ -#define _SourceSafeTypeLib_H_ - -DEFINE_GUID(LIBID_SourceSafeTypeLib,0x783CD4E0L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); -#ifndef BEGIN_INTERFACE -#define BEGIN_INTERFACE -#endif - -typedef enum _VSSFlags { - VSSFLAG_USERRONO = 1, - VSSFLAG_USERROYES = 2, - VSSFLAG_TIMENOW = 4, - VSSFLAG_TIMEMOD = 8, - VSSFLAG_TIMEUPD = 12, - VSSFLAG_EOLCR = 16, - VSSFLAG_EOLLF = 32, - VSSFLAG_EOLCRLF = 48, - VSSFLAG_REPASK = 64, - VSSFLAG_REPREPLACE = 128, - VSSFLAG_REPSKIP = 192, - VSSFLAG_REPMERGE = 256, - VSSFLAG_CMPFULL = 512, - VSSFLAG_CMPTIME = 1024, - VSSFLAG_CMPCHKSUM = 1536, - VSSFLAG_CMPFAIL = 2048, - VSSFLAG_RECURSNO = 4096, - VSSFLAG_RECURSYES = 8192, - VSSFLAG_FORCEDIRNO = 16384, - VSSFLAG_FORCEDIRYES = 32768, - VSSFLAG_KEEPNO = 65536, - VSSFLAG_KEEPYES = 131072, - VSSFLAG_DELNO = 262144, - VSSFLAG_DELYES = 524288, - VSSFLAG_DELNOREPLACE = 786432, - VSSFLAG_BINTEST = 1048576, - VSSFLAG_BINBINARY = 2097152, - VSSFLAG_BINTEXT = 3145728, - VSSFLAG_DELTAYES = 4194304, - VSSFLAG_DELTANO = 8388608, - VSSFLAG_UPDASK = 16777216, - VSSFLAG_UPDUPDATE = 33554432, - VSSFLAG_UPDUNCH = 50331648, - VSSFLAG_GETYES = 67108864, - VSSFLAG_GETNO = 134217728, - VSSFLAG_CHKEXCLUSIVEYES = 268435456, - VSSFLAG_CHKEXCLUSIVENO = 536870912, - VSSFLAG_HISTIGNOREFILES = 1073741824 -} VSSFlags; - -typedef enum _VSSFileStatus { - VSSFILE_NOTCHECKEDOUT = 0, - VSSFILE_CHECKEDOUT = 1, - VSSFILE_CHECKEDOUT_ME = 2 -} VSSFileStatus; - -typedef enum _VSSItemType { - VSSITEM_PROJECT = 0, - VSSITEM_FILE = 1 -} VSSItemType; - -interface IVSSItems; - -interface IVSSVersions; - -interface IVSSVersion; - -interface IVSSCheckouts; - -interface IVSSCheckout; - -DEFINE_GUID(IID_IVSSItem,0x783CD4E1L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -/* Definition of interface: IVSSItem */ -#undef INTERFACE -#define INTERFACE IVSSItem - -DECLARE_INTERFACE_(IVSSItem, IDispatch) -{ -BEGIN_INTERFACE -#ifndef NO_BASEINTERFACE_FUNCS - - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; - - /* IDispatch methods */ - STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE; - - STDMETHOD(GetTypeInfo)( - THIS_ - UINT itinfo, - LCID lcid, - ITypeInfo FAR* FAR* pptinfo) PURE; - - STDMETHOD(GetIDsOfNames)( - THIS_ - REFIID riid, - OLECHAR FAR* FAR* rgszNames, - UINT cNames, - LCID lcid, - DISPID FAR* rgdispid) PURE; - - STDMETHOD(Invoke)( - THIS_ - DISPID dispidMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS FAR* pdispparams, - VARIANT FAR* pvarResult, - EXCEPINFO FAR* pexcepinfo, - UINT FAR* puArgErr) PURE; -#endif - - /* IVSSItem methods */ - STDMETHOD(get_Spec)(THIS_ BSTR FAR* pSpec) PURE; - STDMETHOD(get_Binary)(THIS_ VARIANT_BOOL FAR* pbBinary) PURE; - STDMETHOD(put_Binary)(THIS_ VARIANT_BOOL bBinary) PURE; - STDMETHOD(get_Deleted)(THIS_ VARIANT_BOOL FAR* pbDeleted) PURE; - STDMETHOD(put_Deleted)(THIS_ VARIANT_BOOL bDeleted) PURE; - STDMETHOD(get_Type)(THIS_ int FAR* piType) PURE; - STDMETHOD(get_LocalSpec)(THIS_ BSTR FAR* pLocal) PURE; - STDMETHOD(put_LocalSpec)(THIS_ BSTR Local) PURE; - STDMETHOD(get_Name)(THIS_ BSTR FAR* pName) PURE; - STDMETHOD(put_Name)(THIS_ BSTR Name) PURE; - STDMETHOD(get_Parent)(THIS_ IVSSItem FAR* FAR* ppIParent) PURE; - STDMETHOD(get_VersionNumber)(THIS_ long FAR* piVersion) PURE; - STDMETHOD(get_Items)(THIS_ VARIANT_BOOL IncludeDeleted, IVSSItems FAR* FAR* ppIItems) PURE; - STDMETHOD(Get)(THIS_ BSTR FAR* Local, long iFlags) PURE; - STDMETHOD(Checkout)(THIS_ BSTR Comment, BSTR Local, long iFlags) PURE; - STDMETHOD(Checkin)(THIS_ BSTR Comment, BSTR Local, long iFlags) PURE; - STDMETHOD(UndoCheckout)(THIS_ BSTR Local, long iFlags) PURE; - STDMETHOD(get_IsCheckedOut)(THIS_ long FAR* piStatus) PURE; - STDMETHOD(get_Checkouts)(THIS_ IVSSCheckouts FAR* FAR* ppICheckouts) PURE; - STDMETHOD(get_IsDifferent)(THIS_ BSTR Local, VARIANT_BOOL FAR* pbDifferent) PURE; - STDMETHOD(Add)(THIS_ BSTR Local, BSTR Comment, long iFlags, IVSSItem FAR* FAR* ppIItem) PURE; - STDMETHOD(NewSubproject)(THIS_ BSTR Name, BSTR Comment, IVSSItem FAR* FAR* ppIItem) PURE; - STDMETHOD(Share)(THIS_ IVSSItem FAR* pIItem, BSTR Comment, long iFlags) PURE; - STDMETHOD(Destroy)(THIS) PURE; - STDMETHOD(Move)(THIS_ IVSSItem FAR* pINewParent) PURE; - STDMETHOD(Label)(THIS_ BSTR Label, BSTR Comment) PURE; - STDMETHOD(get_Versions)(THIS_ long iFlags, IVSSVersions FAR* FAR* pIVersions) PURE; - STDMETHOD(get_Version)(THIS_ VARIANT Version, IVSSItem FAR* FAR* ppIItem) PURE; -}; - -DEFINE_GUID(IID_IVSSVersions,0x783CD4E7L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -/* Definition of interface: IVSSVersions */ -#undef INTERFACE -#define INTERFACE IVSSVersions - -DECLARE_INTERFACE_(IVSSVersions, IDispatch) -{ -BEGIN_INTERFACE -#ifndef NO_BASEINTERFACE_FUNCS - - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; - - /* IDispatch methods */ - STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE; - - STDMETHOD(GetTypeInfo)( - THIS_ - UINT itinfo, - LCID lcid, - ITypeInfo FAR* FAR* pptinfo) PURE; - - STDMETHOD(GetIDsOfNames)( - THIS_ - REFIID riid, - OLECHAR FAR* FAR* rgszNames, - UINT cNames, - LCID lcid, - DISPID FAR* rgdispid) PURE; - - STDMETHOD(Invoke)( - THIS_ - DISPID dispidMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS FAR* pdispparams, - VARIANT FAR* pvarResult, - EXCEPINFO FAR* pexcepinfo, - UINT FAR* puArgErr) PURE; -#endif - - /* IVSSVersions methods */ - STDMETHOD(_NewEnum)(THIS_ IUnknown * FAR* ppIEnum) PURE; -}; - -DEFINE_GUID(IID_IVSSVersion,0x783CD4E8L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -/* Definition of interface: IVSSVersion */ -#undef INTERFACE -#define INTERFACE IVSSVersion - -DECLARE_INTERFACE_(IVSSVersion, IDispatch) -{ -BEGIN_INTERFACE -#ifndef NO_BASEINTERFACE_FUNCS - - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; - - /* IDispatch methods */ - STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE; - - STDMETHOD(GetTypeInfo)( - THIS_ - UINT itinfo, - LCID lcid, - ITypeInfo FAR* FAR* pptinfo) PURE; - - STDMETHOD(GetIDsOfNames)( - THIS_ - REFIID riid, - OLECHAR FAR* FAR* rgszNames, - UINT cNames, - LCID lcid, - DISPID FAR* rgdispid) PURE; - - STDMETHOD(Invoke)( - THIS_ - DISPID dispidMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS FAR* pdispparams, - VARIANT FAR* pvarResult, - EXCEPINFO FAR* pexcepinfo, - UINT FAR* puArgErr) PURE; -#endif - - /* IVSSVersion methods */ - STDMETHOD(get_Username)(THIS_ BSTR FAR* pUsername) PURE; - STDMETHOD(get_VersionNumber)(THIS_ long FAR* piVersion) PURE; - STDMETHOD(get_Action)(THIS_ BSTR FAR* pAction) PURE; - STDMETHOD(get_Date)(THIS_ DATE FAR* pDate) PURE; - STDMETHOD(get_Comment)(THIS_ BSTR FAR* pComment) PURE; - STDMETHOD(get_Label)(THIS_ BSTR FAR* pLabel) PURE; - STDMETHOD(get_VSSItem)(THIS_ IVSSItem FAR* FAR* ppIItem) PURE; -}; - -DEFINE_GUID(IID_IVSSItems,0x783CD4E5L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -/* Definition of interface: IVSSItems */ -#undef INTERFACE -#define INTERFACE IVSSItems - -DECLARE_INTERFACE_(IVSSItems, IDispatch) -{ -BEGIN_INTERFACE -#ifndef NO_BASEINTERFACE_FUNCS - - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; - - /* IDispatch methods */ - STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE; - - STDMETHOD(GetTypeInfo)( - THIS_ - UINT itinfo, - LCID lcid, - ITypeInfo FAR* FAR* pptinfo) PURE; - - STDMETHOD(GetIDsOfNames)( - THIS_ - REFIID riid, - OLECHAR FAR* FAR* rgszNames, - UINT cNames, - LCID lcid, - DISPID FAR* rgdispid) PURE; - - STDMETHOD(Invoke)( - THIS_ - DISPID dispidMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS FAR* pdispparams, - VARIANT FAR* pvarResult, - EXCEPINFO FAR* pexcepinfo, - UINT FAR* puArgErr) PURE; -#endif - - /* IVSSItems methods */ - STDMETHOD(get_Count)(THIS_ long FAR* piCount) PURE; - STDMETHOD(get_Item)(THIS_ VARIANT sItem, IVSSItem FAR* FAR* ppIItem) PURE; - STDMETHOD(_NewEnum)(THIS_ IUnknown * FAR* ppIEnum) PURE; -}; - -DEFINE_GUID(IID_IVSSCheckouts,0x8903A770L,0xF55F,0x11CF,0x92,0x27,0x00,0xAA,0x00,0xA1,0xEB,0x95); - -/* Definition of interface: IVSSCheckouts */ -#undef INTERFACE -#define INTERFACE IVSSCheckouts - -DECLARE_INTERFACE_(IVSSCheckouts, IDispatch) -{ -BEGIN_INTERFACE -#ifndef NO_BASEINTERFACE_FUNCS - - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; - - /* IDispatch methods */ - STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE; - - STDMETHOD(GetTypeInfo)( - THIS_ - UINT itinfo, - LCID lcid, - ITypeInfo FAR* FAR* pptinfo) PURE; - - STDMETHOD(GetIDsOfNames)( - THIS_ - REFIID riid, - OLECHAR FAR* FAR* rgszNames, - UINT cNames, - LCID lcid, - DISPID FAR* rgdispid) PURE; - - STDMETHOD(Invoke)( - THIS_ - DISPID dispidMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS FAR* pdispparams, - VARIANT FAR* pvarResult, - EXCEPINFO FAR* pexcepinfo, - UINT FAR* puArgErr) PURE; -#endif - - /* IVSSCheckouts methods */ - STDMETHOD(get_Count)(THIS_ long FAR* piCount) PURE; - STDMETHOD(get_Item)(THIS_ VARIANT sItem, IVSSCheckout FAR* FAR* ppICheckout) PURE; - STDMETHOD(_NewEnum)(THIS_ IUnknown * FAR* ppIEnum) PURE; -}; - -DEFINE_GUID(IID_IVSSCheckout,0x783CD4E6L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -/* Definition of interface: IVSSCheckout */ -#undef INTERFACE -#define INTERFACE IVSSCheckout - -DECLARE_INTERFACE_(IVSSCheckout, IDispatch) -{ -BEGIN_INTERFACE -#ifndef NO_BASEINTERFACE_FUNCS - - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; - - /* IDispatch methods */ - STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE; - - STDMETHOD(GetTypeInfo)( - THIS_ - UINT itinfo, - LCID lcid, - ITypeInfo FAR* FAR* pptinfo) PURE; - - STDMETHOD(GetIDsOfNames)( - THIS_ - REFIID riid, - OLECHAR FAR* FAR* rgszNames, - UINT cNames, - LCID lcid, - DISPID FAR* rgdispid) PURE; - - STDMETHOD(Invoke)( - THIS_ - DISPID dispidMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS FAR* pdispparams, - VARIANT FAR* pvarResult, - EXCEPINFO FAR* pexcepinfo, - UINT FAR* puArgErr) PURE; -#endif - - /* IVSSCheckout methods */ - STDMETHOD(get_Username)(THIS_ BSTR FAR* pUsername) PURE; - STDMETHOD(get_Date)(THIS_ DATE FAR* pDate) PURE; - STDMETHOD(get_LocalSpec)(THIS_ BSTR FAR* pLocal) PURE; - STDMETHOD(get_Machine)(THIS_ BSTR FAR* pMachine) PURE; - STDMETHOD(get_Project)(THIS_ BSTR FAR* pProject) PURE; - STDMETHOD(get_Comment)(THIS_ BSTR FAR* pComment) PURE; - STDMETHOD(get_VersionNumber)(THIS_ long FAR* piVersion) PURE; -}; - -DEFINE_GUID(IID_IVSSDatabase,0x783CD4E2L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -/* Definition of interface: IVSSDatabase */ -#undef INTERFACE -#define INTERFACE IVSSDatabase - -DECLARE_INTERFACE_(IVSSDatabase, IDispatch) -{ -BEGIN_INTERFACE -#ifndef NO_BASEINTERFACE_FUNCS - - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; - - /* IDispatch methods */ - STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE; - - STDMETHOD(GetTypeInfo)( - THIS_ - UINT itinfo, - LCID lcid, - ITypeInfo FAR* FAR* pptinfo) PURE; - - STDMETHOD(GetIDsOfNames)( - THIS_ - REFIID riid, - OLECHAR FAR* FAR* rgszNames, - UINT cNames, - LCID lcid, - DISPID FAR* rgdispid) PURE; - - STDMETHOD(Invoke)( - THIS_ - DISPID dispidMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS FAR* pdispparams, - VARIANT FAR* pvarResult, - EXCEPINFO FAR* pexcepinfo, - UINT FAR* puArgErr) PURE; -#endif - - /* IVSSDatabase methods */ - STDMETHOD(Open)(THIS_ BSTR SrcSafeIni, BSTR Username, BSTR Password) PURE; - STDMETHOD(get_SrcSafeIni)(THIS_ BSTR FAR* pSrcSafeIni) PURE; - STDMETHOD(get_DatabaseName)(THIS_ BSTR FAR* pDatabaseName) PURE; - STDMETHOD(get_UserName)(THIS_ BSTR FAR* pUsername) PURE; - STDMETHOD(get_CurrentProject)(THIS_ BSTR FAR* pPrj) PURE; - STDMETHOD(put_CurrentProject)(THIS_ BSTR Prj) PURE; - STDMETHOD(get_VSSItem)(THIS_ BSTR Spec, VARIANT_BOOL Deleted, IVSSItem FAR* FAR* ppIVSSItem) PURE; -}; - -DEFINE_GUID(CLSID_VSSItem,0x783CD4E3L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -#ifdef __cplusplus -class VSSItem; -#endif - -DEFINE_GUID(CLSID_VSSVersion,0x783CD4ECL,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -#ifdef __cplusplus -class VSSVersion; -#endif - -DEFINE_GUID(CLSID_VSSCheckout,0x2A0DE0E0L,0x2E9F,0x11D0,0x92,0x36,0x00,0xAA,0x00,0xA1,0xEB,0x95); - -#ifdef __cplusplus -class VSSCheckout; -#endif - -DEFINE_GUID(CLSID_VSSDatabase,0x783CD4E4L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -#ifdef __cplusplus -class VSSDatabase; -#endif - -DEFINE_GUID(IID_IVSSEvents,0x783CD4E9L,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -/* Definition of interface: IVSSEvents */ -#undef INTERFACE -#define INTERFACE IVSSEvents - -DECLARE_INTERFACE_(IVSSEvents, IUnknown) -{ -BEGIN_INTERFACE -#ifndef NO_BASEINTERFACE_FUNCS - - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; -#endif - - /* IVSSEvents methods */ - STDMETHOD(BeforeAdd)(THIS_ IVSSItem FAR* pIPrj, BSTR Local, VARIANT_BOOL FAR* pbContinue) PURE; - STDMETHOD(AfterAdd)(THIS_ IVSSItem FAR* pIItem, BSTR Local) PURE; - STDMETHOD(BeforeCheckout)(THIS_ IVSSItem FAR* pIItem, BSTR Local, VARIANT_BOOL FAR* pbContinue) PURE; - STDMETHOD(AfterCheckout)(THIS_ IVSSItem FAR* pIItem, BSTR Local) PURE; - STDMETHOD(BeforeCheckin)(THIS_ IVSSItem FAR* pIItem, BSTR Local, VARIANT_BOOL FAR* pbContinue) PURE; - STDMETHOD(AfterCheckin)(THIS_ IVSSItem FAR* pIItem, BSTR Local) PURE; - STDMETHOD(BeforeUndoCheckout)(THIS_ IVSSItem FAR* pIItem, BSTR Local, VARIANT_BOOL FAR* pbContinue) PURE; - STDMETHOD(AfterUndoCheckout)(THIS_ IVSSItem FAR* pIItem, BSTR Local) PURE; - STDMETHOD(BeforeRename)(THIS_ IVSSItem FAR* pIItem, BSTR NewName, VARIANT_BOOL FAR* pbContinue) PURE; - STDMETHOD(AfterRename)(THIS_ IVSSItem FAR* pIItem, BSTR OldName) PURE; - STDMETHOD(BeforeBranch)(THIS_ IVSSItem FAR* pIItem, VARIANT_BOOL FAR* pbContinue) PURE; - STDMETHOD(AfterBranch)(THIS_ IVSSItem FAR* pIItem) PURE; - STDMETHOD(BeforeEvent)(THIS_ long iEvent, IVSSItem FAR* pIItem, BSTR Str, VARIANT var, VARIANT_BOOL FAR* pbContinue) PURE; - STDMETHOD(AfterEvent)(THIS_ long iEvent, IVSSItem FAR* pIItem, BSTR Str, VARIANT var) PURE; -}; - -DEFINE_GUID(IID_IVSS,0x783CD4EBL,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -/* Definition of interface: IVSS */ -#undef INTERFACE -#define INTERFACE IVSS - -DECLARE_INTERFACE_(IVSS, IDispatch) -{ -BEGIN_INTERFACE -#ifndef NO_BASEINTERFACE_FUNCS - - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; - - /* IDispatch methods */ - STDMETHOD(GetTypeInfoCount)(THIS_ UINT FAR* pctinfo) PURE; - - STDMETHOD(GetTypeInfo)( - THIS_ - UINT itinfo, - LCID lcid, - ITypeInfo FAR* FAR* pptinfo) PURE; - - STDMETHOD(GetIDsOfNames)( - THIS_ - REFIID riid, - OLECHAR FAR* FAR* rgszNames, - UINT cNames, - LCID lcid, - DISPID FAR* rgdispid) PURE; - - STDMETHOD(Invoke)( - THIS_ - DISPID dispidMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS FAR* pdispparams, - VARIANT FAR* pvarResult, - EXCEPINFO FAR* pexcepinfo, - UINT FAR* puArgErr) PURE; -#endif - - /* IVSS methods */ - STDMETHOD(get_VSSDatabase)(THIS_ IVSSDatabase FAR* FAR* ppIVSSDatabase) PURE; -}; - -DEFINE_GUID(IID_IVSSEventHandler,0x783CD4EAL,0x9D54,0x11CF,0xB8,0xEE,0x00,0x60,0x8C,0xC9,0xA7,0x1F); - -/* Definition of interface: IVSSEventHandler */ -#undef INTERFACE -#define INTERFACE IVSSEventHandler - -DECLARE_INTERFACE_(IVSSEventHandler, IUnknown) -{ -BEGIN_INTERFACE -#ifndef NO_BASEINTERFACE_FUNCS - - /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID FAR* ppvObj) PURE; - STDMETHOD_(ULONG, AddRef)(THIS) PURE; - STDMETHOD_(ULONG, Release)(THIS) PURE; -#endif - - /* IVSSEventHandler methods */ - STDMETHOD(Init)(THIS_ IVSS FAR* pIVSS) PURE; -}; - -DEFINE_GUID(CLSID_VSSApp,0x2A0DE0E1L,0x2E9F,0x11D0,0x92,0x36,0x00,0xAA,0x00,0xA1,0xEB,0x95); - -#ifdef __cplusplus -class VSSApp; -#endif - -#endif Deleted: trunk/Src/winnt_supp.h =================================================================== --- trunk/Src/winnt_supp.h 2013-03-06 22:57:49 UTC (rev 7600) +++ trunk/Src/winnt_supp.h 2013-03-06 23:23:15 UTC (rev 7601) @@ -1,48 +0,0 @@ -/** - * @file winnt_supp.h - * - * @brief stuff from PlatformSDK version of WinNT.h which MSVC6 version lacks - */ -// RCS ID line follows -- this is updated by CVS -// $Id$ - - -#ifndef winnt_supp_h_included -#define winnt_supp_h_included - - -#ifndef VER_NT_WORKSTATION -#define VER_NT_WORKSTATION 0x0000001 -#endif - -#ifndef VER_NT_DOMAIN_CONTROLLER -#define VER_NT_DOMAIN_CONTROLLER 0x0000002 -#endif - -#ifndef VER_NT_SERVER -#define VER_NT_SERVER 0x0000003 -#endif - -#ifndef VER_SUITE_ENTERPRISE -#define VER_SUITE_ENTERPRISE 0x00000002 -#endif - -#ifndef VER_SUITE_DATACENTER -#define VER_SUITE_DATACENTER 0x00000080 -#endif - -#ifndef VER_SUITE_SINGLEUSERTS -#define VER_SUITE_SINGLEUSERTS 0x00000100 -#endif - -#ifndef VER_SUITE_PERSONAL -#define VER_SUITE_PERSONAL 0x00000200 -#endif - -#ifndef VER_SUITE_BLADE -#define VER_SUITE_BLADE 0x00000400 -#endif - - - -#endif winnt_supp_h_included This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2013-03-27 18:42:02
|
Revision: 7615 http://sourceforge.net/p/winmerge/code/7615 Author: gerundt Date: 2013-03-27 18:41:57 +0000 (Wed, 27 Mar 2013) Log Message: ----------- Remove MFC dependency Modified Paths: -------------- trunk/Src/Common/PidlContainer.cpp trunk/Src/DiffFileInfo.cpp trunk/Src/Merge.vcproj trunk/Src/MergeX64.vcproj Modified: trunk/Src/Common/PidlContainer.cpp =================================================================== --- trunk/Src/Common/PidlContainer.cpp 2013-03-24 10:06:01 UTC (rev 7614) +++ trunk/Src/Common/PidlContainer.cpp 2013-03-27 18:41:57 UTC (rev 7615) @@ -26,18 +26,11 @@ // Revision ID line follows -- this is updated by SVN // $Id$ -#include "StdAfx.h" #include "PidlContainer.h" #include <ShlObj.h> #include <comdef.h> -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - CPidlContainer::~CPidlContainer() { IMallocPtr m_pMalloc; Modified: trunk/Src/DiffFileInfo.cpp =================================================================== --- trunk/Src/DiffFileInfo.cpp 2013-03-24 10:06:01 UTC (rev 7614) +++ trunk/Src/DiffFileInfo.cpp 2013-03-27 18:41:57 UTC (rev 7615) @@ -22,11 +22,11 @@ // ID line follows -- this is updated by SVN // $Id$ -#include "stdafx.h" +#include <windows.h> +#include <tchar.h> + #include "DirItem.h" #include "DiffFileInfo.h" -#include "unicoder.h" -#include "UnicodeString.h" /** * @brief Convert file flags to string presentation. Modified: trunk/Src/Merge.vcproj =================================================================== --- trunk/Src/Merge.vcproj 2013-03-24 10:06:01 UTC (rev 7614) +++ trunk/Src/Merge.vcproj 2013-03-27 18:41:57 UTC (rev 7615) @@ -819,6 +819,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" /> </FileConfiguration> <FileConfiguration @@ -829,6 +830,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" BrowseInformation="1" /> </FileConfiguration> @@ -2765,6 +2767,29 @@ <File RelativePath="Common\PidlContainer.cpp" > + <FileConfiguration + Name="UnicodeRelease|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + /> + </FileConfiguration> + <FileConfiguration + Name="UnicodeDebug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + BrowseInformation="1" + /> + </FileConfiguration> </File> <File RelativePath="PluginManager.cpp" Modified: trunk/Src/MergeX64.vcproj =================================================================== --- trunk/Src/MergeX64.vcproj 2013-03-24 10:06:01 UTC (rev 7614) +++ trunk/Src/MergeX64.vcproj 2013-03-27 18:41:57 UTC (rev 7615) @@ -1460,6 +1460,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" /> </FileConfiguration> <FileConfiguration @@ -1470,6 +1471,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" /> </FileConfiguration> <FileConfiguration @@ -1480,6 +1482,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" BrowseInformation="1" /> </FileConfiguration> @@ -1491,6 +1494,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" BrowseInformation="1" /> </FileConfiguration> @@ -4898,6 +4902,52 @@ <File RelativePath=".\Common\PidlContainer.cpp" > + <FileConfiguration + Name="UnicodeRelease|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + /> + </FileConfiguration> + <FileConfiguration + Name="UnicodeRelease|x64" + > + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + /> + </FileConfiguration> + <FileConfiguration + Name="UnicodeDebug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + BrowseInformation="1" + /> + </FileConfiguration> + <FileConfiguration + Name="UnicodeDebug|x64" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + BrowseInformation="1" + /> + </FileConfiguration> </File> <File RelativePath="PluginManager.cpp" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |