Thread: [Winmerge-svn] SF.net SVN: winmerge: [3588] trunk/Src (Page 2)
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
winmerge-svn
|
From: <ki...@us...> - 2006-09-20 14:25:27
|
Revision: 3588
http://svn.sourceforge.net/winmerge/?rev=3588&view=rev
Author: kimmov
Date: 2006-09-20 07:25:17 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/Changes.txt
trunk/Src/ChildFrm.cpp
trunk/Src/Common/CSubclass.cpp
trunk/Src/Common/PropertyPageHost.cpp
trunk/Src/Common/sizecbar.cpp
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/7zCommon.cpp 2006-09-20 14:25:17 UTC (rev 3588)
@@ -483,7 +483,7 @@
if (hCursor)
{
SetCursor(hCursor);
- SetWindowLong(hWnd, DWL_MSGRESULT, 1);
+ SetWindowLongPtr(hWnd, DWLP_MSGRESULT, 1);
return TRUE;
}
} return FALSE;
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/Changes.txt 2006-09-20 14:25:17 UTC (rev 3588)
@@ -5,6 +5,9 @@
2006-09-20 Kimmo
PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
Src/Common: UniFile.cpp
+ PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
+ Src: 7zCommon.cpp ChildFrm.cpp
+ Src/Common: CSubclass.cpp sizecbar.cpp
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/ChildFrm.cpp 2006-09-20 14:25:17 UTC (rev 3588)
@@ -361,7 +361,7 @@
EnumChildWindows(hwnd, EnumChildProc, FALSE);
- pfnOldWndProc = (WNDPROC)SetWindowLong(hwnd, GWL_WNDPROC, (LONG)WndProc);
+ pfnOldWndProc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG)WndProc);
SetProp(hwnd, _T("OldWndProc"), (HANDLE)pfnOldWndProc);
return TRUE;
}
@@ -373,7 +373,7 @@
{
WNDPROC pfnOldWndProc = (WNDPROC)RemoveProp(hwnd, _T("OldWndProc"));
if (pfnOldWndProc)
- SetWindowLong(hwnd, GWL_WNDPROC, (LONG)pfnOldWndProc);
+ SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG)pfnOldWndProc);
EnumChildWindows(hwnd, EnumChildProc, TRUE);
Modified: trunk/Src/Common/CSubclass.cpp
===================================================================
--- trunk/Src/Common/CSubclass.cpp 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/Common/CSubclass.cpp 2006-09-20 14:25:17 UTC (rev 3588)
@@ -2,7 +2,7 @@
\file CSubclass.cpp
\author Perry Rapp, Creator, 1998-2003
\date Created: 1998
- \date Edited: 2001/12/12 PR
+ \date Edited: 2006/09/20 Kimmo Varis: use Get/SetWindowLongPtr().
\brief Implementation of CSubclass
@@ -83,7 +83,7 @@
SubclassRec sdata;
sdata.m_data = data;
sdata.m_newproc = wndproc;
- sdata.m_oldproc = (WNDPROC) GetWindowLong(hwnd, GWL_WNDPROC);
+ sdata.m_oldproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
sdata.m_suppressing = false;
if (unsubclassSucceeded)
sdata.m_succeededMsg = *unsubclassSucceeded;
@@ -93,7 +93,7 @@
sdata.m_failedMsg = *unsubclassFailed;
else
sdata.m_failedMsg.msg = 0;
- SetWindowLong(hwnd, GWL_WNDPROC, (LPARAM)(WNDPROC)wndproc);
+ SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LPARAM)(WNDPROC)wndproc);
pList->AddHead(sdata);
return true;
}
@@ -114,12 +114,12 @@
SubclassRec srec = pList->GetNext(pos);
if (srec.m_newproc == id)
{ // we're the latest subclass
- WNDPROC curproc = (WNDPROC) GetWindowLong(hwnd, GWL_WNDPROC);
+ WNDPROC curproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
if (id != curproc)
// We're not the current wndproc, so we can't safely unhook
return false;
ASSERT(srec.m_oldproc); // internal error
- SetWindowLong(hwnd, GWL_WNDPROC, (LPARAM)(WNDPROC)srec.m_oldproc);
+ SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LPARAM)(WNDPROC)srec.m_oldproc);
pList->RemoveHead();
// fall thru to garbage collect list
}
Modified: trunk/Src/Common/PropertyPageHost.cpp
===================================================================
--- trunk/Src/Common/PropertyPageHost.cpp 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/Common/PropertyPageHost.cpp 2006-09-20 14:25:17 UTC (rev 3588)
@@ -12,7 +12,11 @@
#include "PropertyPageHost.h"
#if _MSC_VER > 1200
+#ifdef _WIN64
+# include <../src/mfc/occimpl.h>
+#else // _WIN64
# include <afxocc.h>
+#endif // _WIN64
#else
# include <..\src\occimpl.h>
#endif
Modified: trunk/Src/Common/sizecbar.cpp
===================================================================
--- trunk/Src/Common/sizecbar.cpp 2006-09-20 14:18:18 UTC (rev 3587)
+++ trunk/Src/Common/sizecbar.cpp 2006-09-20 14:25:17 UTC (rev 3588)
@@ -534,7 +534,7 @@
// erase the NC background
mdc.FillRect(rcDraw, CBrush::FromHandle(
- (HBRUSH) GetClassLong(m_hWnd, GCL_HBRBACKGROUND)));
+ (HBRUSH) GetClassLongPtr(m_hWnd, GCLP_HBRBACKGROUND)));
if (m_dwSCBStyle & SCBS_SHOWEDGES)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 14:32:56
|
Revision: 3589
http://svn.sourceforge.net/winmerge/?rev=3589&view=rev
Author: kimmov
Date: 2006-09-20 07:32:50 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
Modified Paths:
--------------
trunk/Src/7zCommon.cpp
trunk/Src/Changes.txt
Modified: trunk/Src/7zCommon.cpp
===================================================================
--- trunk/Src/7zCommon.cpp 2006-09-20 14:25:17 UTC (rev 3588)
+++ trunk/Src/7zCommon.cpp 2006-09-20 14:32:50 UTC (rev 3589)
@@ -199,7 +199,7 @@
static const DWORD m_dwVer7zRecommended;
static const TCHAR m_strRegistryKey[];
static const TCHAR m_strDownloadURL[];
- static BOOL CALLBACK DlgProc(HWND, UINT, WPARAM, LPARAM);
+ static INT_PTR CALLBACK DlgProc(HWND, UINT, WPARAM, LPARAM);
static DWORD FormatVersion(LPTSTR, LPTSTR, DWORD);
};
@@ -363,7 +363,7 @@
/**
* @brief DLGPROC for C7ZipMismatchException's ReportError() popup.
*/
-BOOL CALLBACK C7ZipMismatchException::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK C7ZipMismatchException::DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
@@ -522,7 +522,7 @@
*/
int C7ZipMismatchException::ReportError(UINT nType, UINT nMessageID)
{
- short response = -1;
+ UINT_PTR response = -1;
m_bShowAllways = nMessageID;
if (!m_bShowAllways)
{
@@ -658,7 +658,7 @@
/**
* @brief Callback to pass to EnumResourceLanguages.
*/
-BOOL CALLBACK FindNextResLang(HMODULE hModule, LPCTSTR lpType, LPCTSTR lpName, WORD wLanguage, LONG lParam)
+BOOL CALLBACK FindNextResLang(HANDLE hModule, LPCTSTR lpType, LPCTSTR lpName, WORD wLanguage, LONG_PTR lParam)
{
LPWORD pwLanguage = (LPWORD)lParam;
WORD wPrevious = *pwLanguage;
@@ -736,7 +736,7 @@
if (HINSTANCE hinstLang = AfxGetResourceHandle())
{
WORD wLangID = 0;
- if (EnumResourceLanguages(hinstLang, RT_VERSION, MAKEINTRESOURCE(VS_VERSION_INFO), FindNextResLang, (LPARAM)&wLangID) == 0)
+ if (EnumResourceLanguages(hinstLang, RT_VERSION, MAKEINTRESOURCE(VS_VERSION_INFO), (ENUMRESLANGPROC)FindNextResLang, (LPARAM)&wLangID) == 0)
{
flags |= wLangID << 16;
}
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 14:25:17 UTC (rev 3588)
+++ trunk/Src/Changes.txt 2006-09-20 14:32:50 UTC (rev 3589)
@@ -8,6 +8,8 @@
PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
Src: 7zCommon.cpp ChildFrm.cpp
Src/Common: CSubclass.cpp sizecbar.cpp
+ BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
+ Src: 7zCommon.cpp
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 14:38:31
|
Revision: 3590
http://svn.sourceforge.net/winmerge/?rev=3590&view=rev
Author: kimmov
Date: 2006-09-20 07:38:13 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffWrapper.cpp
trunk/Src/DiffWrapper.h
trunk/Src/Merge.dsp
Added Paths:
-----------
trunk/Src/FilterCommentsManager.cpp
trunk/Src/FilterCommentsManager.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 14:32:50 UTC (rev 3589)
+++ trunk/Src/Changes.txt 2006-09-20 14:38:13 UTC (rev 3590)
@@ -10,6 +10,9 @@
Src/Common: CSubclass.cpp sizecbar.cpp
BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
Src: 7zCommon.cpp
+ PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
+ Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
+ Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp 2006-09-20 14:32:50 UTC (rev 3589)
+++ trunk/Src/DiffWrapper.cpp 2006-09-20 14:38:13 UTC (rev 3590)
@@ -39,6 +39,7 @@
#include "CompareOptions.h"
#include "FileTextStats.h"
#include "DiffFileData.h"
+#include "FilterCommentsManager.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -53,150 +54,23 @@
static void CopyTextStats(const file_data * inf, FileTextStats * myTextStats);
static void CopyDiffutilTextStats(file_data *inf, DiffFileData * diffData);
-//Should move FilterComments classes and global functions to it's own *.cpp & *.h file
-//IngnoreComment logic developed by David Maisonave AKA (Axter)
-/**
-@struct FilterCommentsSet
-@brief FilterCommentsSet holds search strings used to find comments in compared files.
- This data is used to find blocks that can be ignored when comparing to files.
-@note
- The ignore-comment logic can only use ANSI strings, because the search buffer is
- char* type.
- Therefore, the data members should not be replaced with CString type, and should
- remain std::string, or other non-unicode type string.
-*/
-struct FilterCommentsSet
-{
- std::string StartMarker;
- std::string EndMarker;
- std::string InlineMarker;
-};
+// Postfiltering
+static bool IsTrivialBytes(const char* Start, const char* End,
+ const FilterCommentsSet& filtercommentsset);
+static bool IsTrivialLine(const std::string &Line, const char * StartOfComment,
+ const char * EndOfComment, const char * InLineComment,
+ const FilterCommentsSet& filtercommentsset);
+static bool PostFilter(int StartPos, int EndPos, int Direction,
+ int QtyLinesInBlock, int &Op, int FileNo,
+ const FilterCommentsSet& filtercommentsset);
+static void PostFilterSingleLine(const char* LineStr, int &Op,
+ const FilterCommentsSet& filtercommentsset, bool PartOfMultiLineCheck);
+static void PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight,
+ int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager,
+ const TCHAR *FileNameExt);
/**
-@class FilterCommentsManager
-@brief FilterCommentsManager reads language comment start and end marker strings from
- an INI file, and stores it in the map member variable m_FilterCommentsSetByFileType.
- Each set of comment markers have a list of file types that can be used with
- the file markers.
-@note
-The ignore-comment logic can only use ANSI strings, because the search buffer is
-char* type.
-FilterCommentsManager uses _T logic, only so-as to allow UNICODE file names to be
-used for the INI file, or INI file base directory.
-After retrieving data from INI file, the data is converted to ANSI.
-If no INI file exist, or the INI file is empty, then a default INI file is
-created with default values that are assoicated with most commen languages.
-*/
-class FilterCommentsManager
-{
-public:
- /**
- @brief FilterCommentsManager constructor, which reads the INI file data
- and populates the mapped member variable m_FilterCommentsSetByFileType.
- @param[in] Optional full INI file name, to include path.
- */
- FilterCommentsManager(const TCHAR* IniFileName = _T("")) : m_IniFileName(IniFileName)
- {
- USES_CONVERSION;
-
- int SectionNo = 0;
- TCHAR SectionName[99];
- TCHAR buffer[1024];
- if (m_IniFileName.IsEmpty())
- {
- m_IniFileName = GetModulePath() + _T("\\IgnoreSectionMarkers.ini");
- }
- for(SectionNo = 0;;++SectionNo)
- {//Get each set of markers
- FilterCommentsSet filtercommentsset;
- _sntprintf(SectionName, sizeof(SectionName)/sizeof(SectionName[0]), _T("set%i"), SectionNo);
- GetPrivateProfileString(SectionName, _T("StartMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
- filtercommentsset.StartMarker = T2CA(buffer);
- GetPrivateProfileString(SectionName, _T("EndMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
- filtercommentsset.EndMarker = T2CA(buffer);
- GetPrivateProfileString(SectionName, _T("InlineMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
- filtercommentsset.InlineMarker = T2CA(buffer);
- if (filtercommentsset.StartMarker.empty() &&
- filtercommentsset.EndMarker.empty() &&
- filtercommentsset.InlineMarker.empty())
- {
- break;
- }
- int FileTypeNo = 0;
- TCHAR FileTypeFieldName[99];
- for(FileTypeNo = 0;;++FileTypeNo)
- {//Get each file type associated with current set of markers
- _sntprintf(FileTypeFieldName, sizeof(FileTypeFieldName)/sizeof(FileTypeFieldName[0]), _T("FileType%i"), FileTypeNo);
- GetPrivateProfileString(SectionName, FileTypeFieldName, _T(""), buffer,sizeof(buffer), m_IniFileName);
- CString FileTypeExtensionName = buffer;
- if (FileTypeExtensionName.IsEmpty())
- break;
- m_FilterCommentsSetByFileType[FileTypeExtensionName] = filtercommentsset;
- }
- }
-
- if (!SectionNo)
- {//If no markers were found, then initialize default markers
- CreateDefaultMarkers();
- }
- }
-
- /**
- @brief Get comment markers that are associated with this file type.
- If there are no comment markers associated with this file type,
- then return an empty set.
- @param[in] The file name extension. Example:("cpp", "java", "c", "h")
- Must be lower case.
- */
- FilterCommentsSet GetSetForFileType(const CString& FileTypeName) const
- {
- std::map <CString, FilterCommentsSet> :: const_iterator pSet =
- m_FilterCommentsSetByFileType.find(FileTypeName);
- if (pSet == m_FilterCommentsSetByFileType.end())
- return FilterCommentsSet();
- return pSet->second;
- }
-private:
- FilterCommentsManager(const FilterCommentsManager&); //Don't allow copy
- FilterCommentsManager& operator=(const FilterCommentsManager&);//Don't allow assignment
- /**
- @brief Create default comment marker strings
- @note
- Currently, only have C/C++/Java type markers.
- */
- void CreateDefaultMarkers()
- {
- USES_CONVERSION;
- int SectionNo = 0;
- TCHAR SectionName[99];
- FilterCommentsSet filtercommentsset;
- filtercommentsset.StartMarker = "/*";
- filtercommentsset.EndMarker = "*/";
- filtercommentsset.InlineMarker = "//";
- TCHAR CommonFileTypes1[][9] = {_T("java"), _T("cs"), _T("cpp"), _T("c"), _T("h"), _T("cxx"), _T("cc"), _T("js"), _T("jsl"), _T("tli"), _T("tlh"), _T("rc")};
- _sntprintf(SectionName, sizeof(SectionName)/sizeof(SectionName[0]), _T("set%i"), SectionNo);
- ++SectionNo;
- WritePrivateProfileString(SectionName, _T("StartMarker"), A2CT(filtercommentsset.StartMarker.c_str()), m_IniFileName);
- WritePrivateProfileString(SectionName, _T("EndMarker"), A2CT(filtercommentsset.EndMarker.c_str()), m_IniFileName);
- WritePrivateProfileString(SectionName, _T("InlineMarker"), A2CT(filtercommentsset.InlineMarker.c_str()), m_IniFileName);
- int FileTypeNo = 0;
- for(int i = 0;i < sizeof(CommonFileTypes1)/sizeof(CommonFileTypes1[0]);++i)
- {
- m_FilterCommentsSetByFileType[CommonFileTypes1[i]] = filtercommentsset;
- TCHAR FileTypeFieldName[99];
- _sntprintf(FileTypeFieldName, sizeof(FileTypeFieldName)/sizeof(FileTypeFieldName[0]), _T("FileType%i"), FileTypeNo);
- ++FileTypeNo;
- WritePrivateProfileString(SectionName, FileTypeFieldName, CommonFileTypes1[i], m_IniFileName);
- }
- }
-
- //Use CString instead of std::string, so as to allow UNICODE file extensions
- std::map<CString, FilterCommentsSet> m_FilterCommentsSetByFileType;
- CString m_IniFileName;
-};
-
-/**
* @brief Default constructor.
* Initializes members and creates new FilterCommentsManager.
*/
@@ -353,7 +227,8 @@
* @param [in] filtercommentsset - For future use to determine trivial bytes
* @return Returns true if all characters are trivial
*/
-bool IsTrivialBytes(const char* Start, const char* End, const FilterCommentsSet& filtercommentsset)
+static bool IsTrivialBytes(const char* Start, const char* End,
+ const FilterCommentsSet& filtercommentsset)
{
std::string testdata(Start, End);
//@TODO: Need to replace the following trivial string with a user specified string
@@ -370,7 +245,7 @@
* @param [in] filtercommentsset - Comment marker set used to indicate comment blocks.
* @return Returns true if entire line is trivial
*/
-bool IsTrivialLine(const std::string &Line,
+static bool IsTrivialLine(const std::string &Line,
const char * StartOfComment,
const char * EndOfComment,
const char * InLineComment,
@@ -421,7 +296,9 @@
@return Always returns true in reverse direction.
In forward direction, returns false if none trivial data is found within QtyLinesInBlock
*/
-bool PostFilter(int StartPos, int EndPos, int Direction, int QtyLinesInBlock, int &Op, int FileNo, const FilterCommentsSet& filtercommentsset)
+static bool PostFilter(int StartPos, int EndPos, int Direction,
+ int QtyLinesInBlock, int &Op, int FileNo,
+ const FilterCommentsSet& filtercommentsset)
{
const char* EolIndicators = "\r\n"; //List of characters used as EOL
if (Op == OP_TRIVIAL) //If already set to trivial, then exit.
@@ -546,7 +423,8 @@
@param[in] filtercommentsset - Comment marker set used to indicate comment blocks.
@param[in] PartOfMultiLineCheck- Set to true, if this block is a multiple line block
*/
-void PostFilterSingleLine(const char* LineStr, int &Op, const FilterCommentsSet& filtercommentsset, bool PartOfMultiLineCheck)
+static void PostFilterSingleLine(const char* LineStr, int &Op,
+ const FilterCommentsSet& filtercommentsset, bool PartOfMultiLineCheck)
{
if (Op == OP_TRIVIAL)
return;
@@ -587,7 +465,9 @@
@param[in] filtercommentsset - Comment marker set used to indicate comment blocks.
@param[in] FileNameExt - The file name extension. Needs to be lower case string ("cpp", "java", "c")
*/
-void PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight, int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager, const TCHAR *FileNameExt)
+static void PostFilter(int LineNumberLeft, int QtyLinesLeft, int LineNumberRight,
+ int QtyLinesRight, int &Op, const FilterCommentsManager &filtercommentsmanager,
+ const TCHAR *FileNameExt)
{
if (Op == OP_TRIVIAL)
return;
Modified: trunk/Src/DiffWrapper.h
===================================================================
--- trunk/Src/DiffWrapper.h 2006-09-20 14:32:50 UTC (rev 3589)
+++ trunk/Src/DiffWrapper.h 2006-09-20 14:38:13 UTC (rev 3590)
@@ -39,6 +39,8 @@
class DiffList;
struct DiffFileData;
struct file_data;
+class FilterCommentsManager;
+struct FilterCommentsSet;
/** @enum COMPARE_TYPE
* @brief Different foldercompare methods.
Added: trunk/Src/FilterCommentsManager.cpp
===================================================================
--- trunk/Src/FilterCommentsManager.cpp (rev 0)
+++ trunk/Src/FilterCommentsManager.cpp 2006-09-20 14:38:13 UTC (rev 3590)
@@ -0,0 +1,122 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or (at
+// your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file FilterCommentsManager.cpp
+ *
+ * @brief FilterCommentsManager class implementation.
+ */
+
+#include "stdafx.h"
+#include <string>
+#include <map>
+
+#include "coretools.h"
+#include "FilterCommentsManager.h"
+
+/**
+@brief FilterCommentsManager constructor, which reads the INI file data
+ and populates the mapped member variable m_FilterCommentsSetByFileType.
+@param[in] Optional full INI file name, to include path.
+*/
+FilterCommentsManager::FilterCommentsManager(const TCHAR* IniFileName /*= _T("")*/)
+ : m_IniFileName(IniFileName)
+{
+ USES_CONVERSION;
+
+ int SectionNo = 0;
+ TCHAR SectionName[99];
+ TCHAR buffer[1024];
+ if (m_IniFileName.IsEmpty())
+ {
+ m_IniFileName = GetModulePath() + _T("\\IgnoreSectionMarkers.ini");
+ }
+ for(SectionNo = 0;;++SectionNo)
+ {//Get each set of markers
+ FilterCommentsSet filtercommentsset;
+ _sntprintf(SectionName, sizeof(SectionName)/sizeof(SectionName[0]), _T("set%i"), SectionNo);
+ GetPrivateProfileString(SectionName, _T("StartMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
+ filtercommentsset.StartMarker = T2CA(buffer);
+ GetPrivateProfileString(SectionName, _T("EndMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
+ filtercommentsset.EndMarker = T2CA(buffer);
+ GetPrivateProfileString(SectionName, _T("InlineMarker"), _T(""), buffer,sizeof(buffer), m_IniFileName);
+ filtercommentsset.InlineMarker = T2CA(buffer);
+ if (filtercommentsset.StartMarker.empty() &&
+ filtercommentsset.EndMarker.empty() &&
+ filtercommentsset.InlineMarker.empty())
+ {
+ break;
+ }
+ int FileTypeNo = 0;
+ TCHAR FileTypeFieldName[99];
+ for(FileTypeNo = 0;;++FileTypeNo)
+ {//Get each file type associated with current set of markers
+ _sntprintf(FileTypeFieldName, sizeof(FileTypeFieldName)/sizeof(FileTypeFieldName[0]), _T("FileType%i"), FileTypeNo);
+ GetPrivateProfileString(SectionName, FileTypeFieldName, _T(""), buffer,sizeof(buffer), m_IniFileName);
+ CString FileTypeExtensionName = buffer;
+ if (FileTypeExtensionName.IsEmpty())
+ break;
+ m_FilterCommentsSetByFileType[FileTypeExtensionName] = filtercommentsset;
+ }
+ }
+
+ if (!SectionNo)
+ {//If no markers were found, then initialize default markers
+ CreateDefaultMarkers();
+ }
+}
+
+/**
+ @brief Get comment markers that are associated with this file type.
+ If there are no comment markers associated with this file type,
+ then return an empty set.
+ @param[in] The file name extension. Example:("cpp", "java", "c", "h")
+ Must be lower case.
+*/
+FilterCommentsSet FilterCommentsManager::GetSetForFileType(const CString& FileTypeName) const
+{
+ std::map <CString, FilterCommentsSet> :: const_iterator pSet =
+ m_FilterCommentsSetByFileType.find(FileTypeName);
+ if (pSet == m_FilterCommentsSetByFileType.end())
+ return FilterCommentsSet();
+ return pSet->second;
+}
+
+void FilterCommentsManager::CreateDefaultMarkers()
+{
+ USES_CONVERSION;
+ int SectionNo = 0;
+ TCHAR SectionName[99];
+ FilterCommentsSet filtercommentsset;
+ filtercommentsset.StartMarker = "/*";
+ filtercommentsset.EndMarker = "*/";
+ filtercommentsset.InlineMarker = "//";
+ TCHAR CommonFileTypes1[][9] = {_T("java"), _T("cs"), _T("cpp"), _T("c"), _T("h"), _T("cxx"), _T("cc"), _T("js"), _T("jsl"), _T("tli"), _T("tlh"), _T("rc")};
+ _sntprintf(SectionName, sizeof(SectionName)/sizeof(SectionName[0]), _T("set%i"), SectionNo);
+ ++SectionNo;
+ WritePrivateProfileString(SectionName, _T("StartMarker"), A2CT(filtercommentsset.StartMarker.c_str()), m_IniFileName);
+ WritePrivateProfileString(SectionName, _T("EndMarker"), A2CT(filtercommentsset.EndMarker.c_str()), m_IniFileName);
+ WritePrivateProfileString(SectionName, _T("InlineMarker"), A2CT(filtercommentsset.InlineMarker.c_str()), m_IniFileName);
+ int FileTypeNo = 0;
+ for(int i = 0;i < sizeof(CommonFileTypes1)/sizeof(CommonFileTypes1[0]);++i)
+ {
+ m_FilterCommentsSetByFileType[CommonFileTypes1[i]] = filtercommentsset;
+ TCHAR FileTypeFieldName[99];
+ _sntprintf(FileTypeFieldName, sizeof(FileTypeFieldName)/sizeof(FileTypeFieldName[0]), _T("FileType%i"), FileTypeNo);
+ ++FileTypeNo;
+ WritePrivateProfileString(SectionName, FileTypeFieldName, CommonFileTypes1[i], m_IniFileName);
+ }
+}
Added: trunk/Src/FilterCommentsManager.h
===================================================================
--- trunk/Src/FilterCommentsManager.h (rev 0)
+++ trunk/Src/FilterCommentsManager.h 2006-09-20 14:38:13 UTC (rev 3590)
@@ -0,0 +1,78 @@
+/////////////////////////////////////////////////////////////////////////////
+// License (GPLv2+):
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or (at
+// your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file FilterCommentsManager.h
+ *
+ * @brief FilterCommentsManager class declaration.
+ */
+
+//#include <string>
+//#include <map>
+
+#ifndef _FILTERCOMMENTSMANAGER_H_
+#define _FILTERCOMMENTSMANAGER_H_
+
+//IngnoreComment logic developed by David Maisonave AKA (Axter)
+/**
+@struct FilterCommentsSet
+@brief FilterCommentsSet holds search strings used to find comments in compared files.
+ This data is used to find blocks that can be ignored when comparing to files.
+@note
+ The ignore-comment logic can only use ANSI strings, because the search buffer is
+ char* type.
+ Therefore, the data members should not be replaced with CString type, and should
+ remain std::string, or other non-unicode type string.
+*/
+struct FilterCommentsSet
+{
+ std::string StartMarker;
+ std::string EndMarker;
+ std::string InlineMarker;
+};
+
+/**
+@class FilterCommentsManager
+@brief FilterCommentsManager reads language comment start and end marker strings from
+ an INI file, and stores it in the map member variable m_FilterCommentsSetByFileType.
+ Each set of comment markers have a list of file types that can be used with
+ the file markers.
+@note
+The ignore-comment logic can only use ANSI strings, because the search buffer is
+char* type.
+FilterCommentsManager uses _T logic, only so-as to allow UNICODE file names to be
+used for the INI file, or INI file base directory.
+After retrieving data from INI file, the data is converted to ANSI.
+If no INI file exist, or the INI file is empty, then a default INI file is
+created with default values that are assoicated with most commen languages.
+*/
+class FilterCommentsManager
+{
+public:
+ FilterCommentsManager(const TCHAR* IniFileName = _T(""));
+ FilterCommentsSet GetSetForFileType(const CString& FileTypeName) const;
+
+private:
+ FilterCommentsManager(const FilterCommentsManager&); //Don't allow copy
+ FilterCommentsManager& operator=(const FilterCommentsManager&);//Don't allow assignment
+ void CreateDefaultMarkers();
+
+ //Use CString instead of std::string, so as to allow UNICODE file extensions
+ std::map<CString, FilterCommentsSet> m_FilterCommentsSetByFileType;
+ CString m_IniFileName;
+};
+
+#endif // _FILTERCOMMENTSMANAGER_H_
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-09-20 14:32:50 UTC (rev 3589)
+++ trunk/Src/Merge.dsp 2006-09-20 14:38:13 UTC (rev 3590)
@@ -437,6 +437,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FilterCommentsManager.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\GhostTextBuffer.cpp
# End Source File
# Begin Source File
@@ -1161,6 +1165,10 @@
# End Source File
# Begin Source File
+SOURCE=.\FilterCommentsManager.h
+# End Source File
+# Begin Source File
+
SOURCE=.\GhostTextBuffer.h
# End Source File
# Begin Source File
@@ -2412,10 +2420,10 @@
# End Group
# End Target
# End Project
-# Section Merge : {00312E6C-0754-0055-90BD-550078075500}
-# 1:19:IDR_POPUP_ABOUT_DLG:104
-# End Section
# Section Merge : {6F747475-446E-6C62-436C-6B0000003100}
# 1:10:IDB_SPLASH:103
# 2:21:SplashScreenInsertKey:4.0
# End Section
+# Section Merge : {00312E6C-0754-0055-90BD-550078075500}
+# 1:19:IDR_POPUP_ABOUT_DLG:104
+# End Section
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 16:59:09
|
Revision: 3591
http://svn.sourceforge.net/winmerge/?rev=3591&view=rev
Author: kimmov
Date: 2006-09-20 09:58:55 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 14:38:13 UTC (rev 3590)
+++ trunk/Src/Changes.txt 2006-09-20 16:58:55 UTC (rev 3591)
@@ -13,6 +13,8 @@
PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
+ Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
+ Src: Merge.cpp
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-09-20 14:38:13 UTC (rev 3590)
+++ trunk/Src/Merge.cpp 2006-09-20 16:58:55 UTC (rev 3591)
@@ -237,7 +237,7 @@
data.cbData = (DWORD)(p - pszArgs) * sizeof(WCHAR);
data.lpData = pszArgs;
data.dwData = __argc;
- SendMessage(hWnd, WM_COPYDATA, NULL, (LONG)&data);
+ SendMessage(hWnd, WM_COPYDATA, NULL, (LPARAM)&data);
delete[] pszArgs;
ReleaseMutex(hMutex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 19:01:21
|
Revision: 3592
http://svn.sourceforge.net/winmerge/?rev=3592&view=rev
Author: kimmov
Date: 2006-09-20 12:01:09 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
Fix hex number used instead of INVALID_HANDLE_VALUE
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/sinstance.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 16:58:55 UTC (rev 3591)
+++ trunk/Src/Changes.txt 2006-09-20 19:01:09 UTC (rev 3592)
@@ -15,6 +15,8 @@
Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
Src: Merge.cpp
+ Fix hex number used instead of INVALID_HANDLE_VALUE
+ Src/Common: sinstance.cpp
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified: trunk/Src/Common/sinstance.cpp
===================================================================
--- trunk/Src/Common/sinstance.cpp 2006-09-20 16:58:55 UTC (rev 3591)
+++ trunk/Src/Common/sinstance.cpp 2006-09-20 19:01:09 UTC (rev 3592)
@@ -161,7 +161,7 @@
//First create the MMF
int nMMFSize = sizeof(CWindowInstance);
- instanceData.hInstanceData = ::CreateFileMapping((HANDLE)0xFFFFFFFF, NULL, PAGE_READWRITE, 0, nMMFSize, GetMMFFilename());
+ instanceData.hInstanceData = ::CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, nMMFSize, GetMMFFilename());
if (instanceData.hInstanceData == NULL)
{
TRACE(_T("Failed to create the MMF even though this is the first instance, you might want to consider overriding GetMMFFilename()\n"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-20 20:12:18
|
Revision: 3593
http://svn.sourceforge.net/winmerge/?rev=3593&view=rev
Author: kimmov
Date: 2006-09-20 13:12:10 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
Fix 64-bit pointer truncation in SetWindowLongPtr call
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ChildFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-20 19:01:09 UTC (rev 3592)
+++ trunk/Src/Changes.txt 2006-09-20 20:12:10 UTC (rev 3593)
@@ -17,6 +17,8 @@
Src: Merge.cpp
Fix hex number used instead of INVALID_HANDLE_VALUE
Src/Common: sinstance.cpp
+ Fix 64-bit pointer truncation in SetWindowLongPtr call
+ Src: ChildFrm.cpp
2006-09-19 Kimmo
PATCH: [ 1561001 ] Fix FileActionScript type in running actions
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2006-09-20 19:01:09 UTC (rev 3592)
+++ trunk/Src/ChildFrm.cpp 2006-09-20 20:12:10 UTC (rev 3593)
@@ -373,7 +373,7 @@
{
WNDPROC pfnOldWndProc = (WNDPROC)RemoveProp(hwnd, _T("OldWndProc"));
if (pfnOldWndProc)
- SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG)pfnOldWndProc);
+ SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)pfnOldWndProc);
EnumChildWindows(hwnd, EnumChildProc, TRUE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 16:45:52
|
Revision: 3595
http://svn.sourceforge.net/winmerge/?rev=3595&view=rev
Author: kimmov
Date: 2006-09-21 09:45:44 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
PATCH: [ 1558213 ] Tweak text positions in splash screen
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Splash.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-21 16:32:34 UTC (rev 3594)
+++ trunk/Src/Changes.txt 2006-09-21 16:45:44 UTC (rev 3595)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-21 Kimmo
+ PATCH: [ 1558213 ] Tweak text positions in splash screen
+ Src: Splash.cpp
+
2006-09-20 Kimmo
PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
Src/Common: UniFile.cpp
Modified: trunk/Src/Splash.cpp
===================================================================
--- trunk/Src/Splash.cpp 2006-09-21 16:32:34 UTC (rev 3594)
+++ trunk/Src/Splash.cpp 2006-09-21 16:45:44 UTC (rev 3595)
@@ -47,15 +47,11 @@
*/
static const CRect VersionTextArea(255, 5, 469, 20);
-/**
- * @brief Area for developers list.
- */
-static const CRect DevelopersArea(20, 93, 190, 210);
+/** @brief Area for developers list. */
+static const CRect DevelopersArea(20, 88, 190, 210);
-/**
- * @brief Area for copyright text.
- */
-static const CRect CopyrightArea(20, 215, 190, 330);
+/** @brief Area for copyright text. */
+static const CRect CopyrightArea(20, 210, 190, 330);
/////////////////////////////////////////////////////////////////////////////
// Splash Screen class
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 17:09:38
|
Revision: 3597
http://svn.sourceforge.net/winmerge/?rev=3597&view=rev
Author: kimmov
Date: 2006-09-21 10:09:31 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
Fix 64-bit typecast warning
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/GhostTextBuffer.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-21 16:49:15 UTC (rev 3596)
+++ trunk/Src/Changes.txt 2006-09-21 17:09:31 UTC (rev 3597)
@@ -7,6 +7,8 @@
Src: Splash.cpp
Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
ShellExtension: ShellExtension.rc
+ Fix 64-bit typecast warning
+ Src: GhostTextBuffer.h
2006-09-20 Kimmo
PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
Modified: trunk/Src/GhostTextBuffer.h
===================================================================
--- trunk/Src/GhostTextBuffer.h 2006-09-21 16:49:15 UTC (rev 3596)
+++ trunk/Src/GhostTextBuffer.h 2006-09-21 17:09:31 UTC (rev 3597)
@@ -156,10 +156,10 @@
m_nRealLinesCreated = src.m_nRealLinesCreated;
m_nRealLinesInDeletedBlock = src.m_nRealLinesInDeletedBlock;
SetText(src.GetText());
- int size = src.m_paSavedRevisonNumbers->GetSize();
+ INT_PTR size = src.m_paSavedRevisonNumbers->GetSize();
m_paSavedRevisonNumbers = new CDWordArray();
m_paSavedRevisonNumbers->SetSize(size);
- int i;
+ INT_PTR i;
for (i = 0; i < size; i++)
(*m_paSavedRevisonNumbers)[i] = (*src.m_paSavedRevisonNumbers)[i];
return *this;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-21 17:11:20
|
Revision: 3598
http://svn.sourceforge.net/winmerge/?rev=3598&view=rev
Author: kimmov
Date: 2006-09-21 10:11:10 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ChildFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-21 17:09:31 UTC (rev 3597)
+++ trunk/Src/Changes.txt 2006-09-21 17:11:10 UTC (rev 3598)
@@ -9,6 +9,8 @@
ShellExtension: ShellExtension.rc
Fix 64-bit typecast warning
Src: GhostTextBuffer.h
+ Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
+ Src: ChildFrm.cpp
2006-09-20 Kimmo
PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
Modified: trunk/Src/ChildFrm.cpp
===================================================================
--- trunk/Src/ChildFrm.cpp 2006-09-21 17:09:31 UTC (rev 3597)
+++ trunk/Src/ChildFrm.cpp 2006-09-21 17:11:10 UTC (rev 3598)
@@ -361,7 +361,7 @@
EnumChildWindows(hwnd, EnumChildProc, FALSE);
- pfnOldWndProc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG)WndProc);
+ pfnOldWndProc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc);
SetProp(hwnd, _T("OldWndProc"), (HANDLE)pfnOldWndProc);
return TRUE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-22 14:36:01
|
Revision: 3615
http://svn.sourceforge.net/winmerge/?rev=3615&view=rev
Author: kimmov
Date: 2006-09-22 07:35:50 -0700 (Fri, 22 Sep 2006)
Log Message:
-----------
PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/coretools.cpp
trunk/Src/Common/coretools.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-21 18:53:47 UTC (rev 3614)
+++ trunk/Src/Changes.txt 2006-09-22 14:35:50 UTC (rev 3615)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-22 Kimmo
+ PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
+ Src/Common: coretools.cpp coretools.h
+
2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
2006-09-21 Kimmo
Modified: trunk/Src/Common/coretools.cpp
===================================================================
--- trunk/Src/Common/coretools.cpp 2006-09-21 18:53:47 UTC (rev 3614)
+++ trunk/Src/Common/coretools.cpp 2006-09-22 14:35:50 UTC (rev 3615)
@@ -61,7 +61,7 @@
return FALSE;
}
-long GetFileModTime(LPCTSTR szPath)
+time_t GetFileModTime(LPCTSTR szPath)
{
if (!szPath || !szPath[0]) return 0;
struct _stat mystats;
@@ -490,13 +490,13 @@
BOOL FindAnyFile(LPTSTR filespec, LPTSTR name)
{
#ifndef _UNICODE
- struct _finddata_t c_file;
+ struct __finddata64_t c_file;
#else
- struct _wfinddata_t c_file;
+ struct __wfinddata64_t c_file;
#endif
- long hFile;
+ intptr_t hFile;
- if( (hFile = _tfindfirst( filespec, &c_file )) == -1L )
+ if( (hFile = _tfindfirst64( filespec, &c_file )) == -1L )
return FALSE;
_tcscpy(name, c_file.name);
Modified: trunk/Src/Common/coretools.h
===================================================================
--- trunk/Src/Common/coretools.h 2006-09-21 18:53:47 UTC (rev 3614)
+++ trunk/Src/Common/coretools.h 2006-09-22 14:35:50 UTC (rev 3615)
@@ -91,7 +91,7 @@
LPSYSTEMTIME pMod,
LPSYSTEMTIME pCreate =NULL,
LPSYSTEMTIME pAccess =NULL);
-long GetFileModTime(LPCTSTR szPath);
+time_t GetFileModTime(LPCTSTR szPath);
DWORD GetFileSizeEx(LPCTSTR szFilename);
CString GetCDPath();
BOOL HaveAdminAccess();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-22 14:42:14
|
Revision: 3616
http://svn.sourceforge.net/winmerge/?rev=3616&view=rev
Author: kimmov
Date: 2006-09-22 07:42:04 -0700 (Fri, 22 Sep 2006)
Log Message:
-----------
Fix type in ccrystaltextbuffer.h
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/editlib/ccrystaltextbuffer.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-22 14:35:50 UTC (rev 3615)
+++ trunk/Src/Changes.txt 2006-09-22 14:42:04 UTC (rev 3616)
@@ -5,6 +5,8 @@
2006-09-22 Kimmo
PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
Src/Common: coretools.cpp coretools.h
+ Fix type in ccrystaltextbuffer.h
+ Src/editlib: ccrystaltextbuffer.h
2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
Modified: trunk/Src/editlib/ccrystaltextbuffer.h
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.h 2006-09-22 14:35:50 UTC (rev 3615)
+++ trunk/Src/editlib/ccrystaltextbuffer.h 2006-09-22 14:42:04 UTC (rev 3616)
@@ -191,10 +191,10 @@
m_ptEndPos = src.m_ptEndPos;
m_nAction = src.m_nAction;
SetText(src.GetText());
- int size = src.m_paSavedRevisonNumbers->GetSize();
+ INT_PTR size = src.m_paSavedRevisonNumbers->GetSize();
m_paSavedRevisonNumbers = new CDWordArray();
m_paSavedRevisonNumbers->SetSize(size);
- int i;
+ INT_PTR i;
for (i = 0; i < size; i++)
(*m_paSavedRevisonNumbers)[i] = (*src.m_paSavedRevisonNumbers)[i];
return *this;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-22 15:09:30
|
Revision: 3617
http://svn.sourceforge.net/winmerge/?rev=3617&view=rev
Author: kimmov
Date: 2006-09-22 08:09:21 -0700 (Fri, 22 Sep 2006)
Log Message:
-----------
PATCH: [ 1563171 ] Catalan translation update
- submitted by Jordi Vilar
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Catalan/MergeCatalan.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-22 14:42:04 UTC (rev 3616)
+++ trunk/Src/Changes.txt 2006-09-22 15:09:21 UTC (rev 3617)
@@ -7,6 +7,9 @@
Src/Common: coretools.cpp coretools.h
Fix type in ccrystaltextbuffer.h
Src/editlib: ccrystaltextbuffer.h
+ PATCH: [ 1563171 ] Catalan translation update
+ Submitted by Jordi Vilar
+ Src/Languages/Catalan: MergeCatalan.rc
2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-22 14:42:04 UTC (rev 3616)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-22 15:09:21 UTC (rev 3617)
@@ -177,9 +177,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
END
POPUP "Fi&nestra"
BEGIN
@@ -230,7 +230,7 @@
MENUITEM "&Opcions...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "Actualit&za\tF5", ID_REFRESH
- MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN
+ MENUITEM "Actualitza &seleccionats\tCtrl+F5", ID_DIR_RESCAN
END
POPUP "&Visualitzaci\xF3"
BEGIN
@@ -284,9 +284,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
END
POPUP "Fi&nestra"
BEGIN
@@ -341,7 +341,7 @@
MENUITEM "Fes l'es&querra nom\xE9s de lectura", ID_FILE_LEFT_READONLY
MENUITEM "Fes la dre&ta nom\xE9s de lectura", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&Converteix retorns de l\xEDnia a"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -446,9 +446,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
END
POPUP "Fi&nestra"
BEGIN
@@ -783,7 +783,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,140,10
CONTROL "&Expressi\xF3 regular",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
- CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",
+ CONTROL "No facis la &volta al final del fitxer",IDC_FINDDLG_DONTWRAP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10
GROUPBOX "Direcci\xF3",IDC_STATIC,148,23,70,36,WS_GROUP
CONTROL "A&munt",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
@@ -953,12 +953,12 @@
CONTROL "Ignora difer\xE8ncies en l'&hora inferiors a 3 segons",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
- GROUPBOX "Integration",IDC_STATIC,7,30,218,46
+ GROUPBOX "Integraci\xF3",IDC_STATIC,7,30,218,46
CONTROL "&Afegeix un men\xFA contextual a l'explorador del Windows",IDC_EXPLORER_CONTEXT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "Habilita el &men\xFA avan\xE7at",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "In&clou subcarpetes de forma predeterminada",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "&Editor extern:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
@@ -1080,7 +1080,7 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "&Atura",IDC_COMPARISON_STOP,167,15,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,9,
44,241,9
RTEXT "0",IDC_ITEMSCOMPARED,95,29,30,8
RTEXT "0",IDC_ITEMSTOTAL,95,19,30,8
@@ -1190,7 +1190,7 @@
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
PUSHBUTTON "&Prova",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "&Instal\xB7la...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "&Nou...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "&Edita...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "&Suprimeix...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1384,7 +1384,7 @@
LTEXT "&Estil:",IDC_STATIC,7,37,35,8
COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button",
+ CONTROL "&Copia al Porta-retalls",IDC_REPORT_COPYCLIPBOARD,"Button",
BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10
DEFPUSHBUTTON "D'acord",IDOK,157,60,50,14
PUSHBUTTON "Cancel\xB7la",IDCANCEL,211,60,50,14
@@ -1426,7 +1426,7 @@
END
IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
CAPTION "Estad\xEDstiques de comparaci\xF3"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -1951,7 +1951,7 @@
// WINMERGE COMMAND LINE HELP#1
STRINGTABLE
BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
+ IDS_CMDLINE_SYNTAX "Sintaxi : WinMerge [/r] [/e] [/x] [/s]"
IDS_CMDLINE_SYNTAX_ARGS "camiesq camidreta [camisortida]"
IDS_CMDLINE_SYNTAX_ARG_FILTER "m\xE0scara/nom"
IDS_CMDLINE_SYNTAX_LEFTDESC "descesq"
@@ -1966,12 +1966,12 @@
STRINGTABLE
BEGIN
IDS_CMDLINE_FILEMASK "/f o -f especifica la m\xE0scara de fitxers o el nom del filtre per a comparar"
- IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical"
- IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance"
+ IDS_CMDLINE_FASTCLOSE "/x or -x tanca el WinMerge si el resultat \xE9s id\xE8ntic"
+ IDS_CMDLINE_SINGLE_INST "/s or -s obre els camins a una inst\xE0ncia existent del WinMerge"
IDS_CMDLINE_LEFTPATH "camiesq \xE9s el directori o nom de fitxer per a \xE9sser obert a la banda esquerra"
IDS_CMDLINE_RIGHTPATH "camidreta \xE9s el directori o nom de fitxer per a \xE9sser obert a la banda dreta"
IDS_CMDLINE_OUTPUTPATH "camisortida \xE9s un directori de sortida opcional on voleu que siguin desats els fitxers fusionats"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
+ IDS_CMDLINE_SEEMANUAL "Veieu el manual per a una refer\xE8ncia completa de la l\xEDnia de comandes."
END
// VARIOUS OPTIONS
@@ -2011,7 +2011,7 @@
IDS_COMPMETHOD_QUICK_CONTENTS "Contingut en un cop d'ull"
IDS_COMPMETHOD_MODDATE "Data de modificaci\xF3"
IDS_COMPMETHOD_DATESIZE "Data de modificaci\xF3 i mida"
- IDS_COMPMETHOD_SIZE "Size"
+ IDS_COMPMETHOD_SIZE "Mida
END
// FILTER OPTIONS
@@ -2029,14 +2029,14 @@
IDS_FILEFILTER_TMPL_COPY
"No es pot copiar el fitxer de plantilla de filtre a la carpeta de filtres:\n%1\n\nVerifiqueu que la carpeta existeix i s'hi pot escriure."
IDS_FILEFILTER_NO_USERFOLDER
- "User's filter file folder is not defined!\n\nPlease select filter folder in options/System."
+ "La carpeta de fitxers de filtre d'usuari no est\xE0 definida!\n\nSeleccioneu la carpeta de filtres a opcions/sistema."
IDS_FILEFILTER_DELETE_FAIL
- "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
- IDS_FILEFILTER_INSTALL "Locate filter file to install"
+ "No s'ha pogut esborrar el fitxer de filtre:\n%1\n\nPotser el fitxer \xE9s nom\xE9s de lectura?"
+ IDS_FILEFILTER_INSTALL "Localitza el fitxer de filtre a instal\xB7lar"
IDS_FILEFILTER_INSTALLFAIL
- "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
+ "No es pot instal\xB7lar el fitxer de filtre.\n\nNo s'ha pogut copiar el nou fitxer de filtre a la carpeta de filtres."
IDS_FILEFILTER_OVERWRITE
- "Filter file already exists. Overwrite existing filter?"
+ "El fitxer de filtre ja existeix. Voleu sobreescriure el filtre existent?"
END
// VERSION CONTROL OPTIONS
@@ -2285,8 +2285,8 @@
BEGIN
IDS_COLHDR_LENCODING "Codificaci\xF3 esquerra"
IDS_COLHDR_RENCODING "Codificaci\xF3 dreta"
- IDS_COLHDR_NIDIFFS "Ignored Diff."
- IDS_COLHDR_NSDIFFS "Differences"
+ IDS_COLHDR_NIDIFFS "Difer\xE8ncies ignorades"
+ IDS_COLHDR_NSDIFFS "Difer\xE8ncies"
IDS_COLHDR_BINARY "Binari"
END
@@ -2350,8 +2350,8 @@
BEGIN
IDS_COLDESC_LENCODING "Codificaci\xF3 del costat esquerre."
IDS_COLDESC_RENCODING "Codificaci\xF3 del costat dret."
- IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
- IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences."
+ IDS_COLDESC_NIDIFFS "Nombre de difer\xE8ncies ignorades al fitxer. Aquestes difer\xE8ncies s\xF3n ignorades pel WinMerge i no es poden combinar."
+ IDS_COLDESC_NSDIFFS "Nombre de difer\xE8ncies al fitxer. Aquest nombre no inclou les difer\xE8ncies ignorades.."
IDS_COLDESC_BINARY "Mostra un asterisc (*) si el fitxer \xE9s binari."
END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-22 15:17:17
|
Revision: 3618
http://svn.sourceforge.net/winmerge/?rev=3618&view=rev
Author: kimmov
Date: 2006-09-22 08:17:09 -0700 (Fri, 22 Sep 2006)
Log Message:
-----------
PATCH: [ 1563386 ] Spanish translation update
- submitted by Jesus M. Delgado 'Mack'
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Spanish/MergeSpanish.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-22 15:09:21 UTC (rev 3617)
+++ trunk/Src/Changes.txt 2006-09-22 15:17:09 UTC (rev 3618)
@@ -10,6 +10,9 @@
PATCH: [ 1563171 ] Catalan translation update
Submitted by Jordi Vilar
Src/Languages/Catalan: MergeCatalan.rc
+ PATCH: [ 1563386 ] Spanish translation update
+ Submitted by Jesus M. Delgado 'Mack'
+ Src/Languages/Spanish: MergeSpanish.rc
2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-22 15:09:21 UTC (rev 3617)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-09-22 15:17:09 UTC (rev 3618)
@@ -177,9 +177,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recargar complementos", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&Depurar" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Cargar Configuraci\xF3n...", ID_DEBUG_LOADCONFIG
END
POPUP "Ve&ntana"
BEGIN
@@ -230,7 +230,7 @@
MENUITEM "Conf&iguraci\xF3n...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Refrescar\tF5", ID_REFRESH
- MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN
+ MENUITEM "&Refrescar seleccionados\tCtrl+F5", ID_DIR_RESCAN
END
POPUP "&Ver"
BEGIN
@@ -284,9 +284,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recargar complementos", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&Depurar" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Cargar Configuraci\xF3n...", ID_DEBUG_LOADCONFIG
END
POPUP "Ve&ntana"
BEGIN
@@ -341,7 +341,7 @@
MENUITEM "Lado i&zquierdo s\xF3lo lectura", ID_FILE_LEFT_READONLY
MENUITEM "Lado d&erecho s\xF3lo lectura", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&Convertir saltos de l\xEDnea a"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -397,7 +397,7 @@
MENUITEM SEPARATOR
MENUITEM "Mostrar &espacios", ID_VIEW_WHITESPACE
MENUITEM "Mostrar diferencias de &l\xEDnea", ID_VIEW_LINEDIFFS
- MENUITEM "View Line &Numbers", ID_VIEW_LINENUMBERS
+ MENUITEM "Ver &n\xFAmeros de l\xEDnea", ID_VIEW_LINENUMBERS
MENUITEM "&Ajuste de l\xEDnea", ID_VIEW_WORDWRAP
MENUITEM SEPARATOR
MENUITEM "&Intercambiar paneles", ID_VIEW_SWAPPANES
@@ -446,9 +446,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recargar complementos", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&Depurar" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Cargar Configuraci\xF3n...", ID_DEBUG_LOADCONFIG
END
POPUP "Ve&ntana"
BEGIN
@@ -499,7 +499,7 @@
MENUITEM "&Izquierda", ID_DIR_DEL_RIGHT
MENUITEM "&Ambos", ID_DIR_DEL_BOTH
END
- MENUITEM "Re&name", ID_DIR_ITEM_RENAME
+ MENUITEM "Re&nombrar", ID_DIR_ITEM_RENAME
MENUITEM "&Ocultar ficheros", ID_DIR_HIDE_FILENAMES
MENUITEM SEPARATOR
POPUP "Abrir fichero &izquierdo"
@@ -740,7 +740,7 @@
WS_TABSTOP,7,47,206,10
CONTROL "&Permitir solo una instancia en ejecuci\xF3n",IDC_SINGLE_INSTANCE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,206,10
- LTEXT "O&pen-dialog Auto-Completion:",IDC_STATIC,19,72,125,8
+ LTEXT "A&uto-completar en di\xE1logos de apertura:",IDC_STATIC,19,72,125,8
COMBOBOX IDC_AUTO_COMPLETE_SOURCE,20,81,147,41,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
GROUPBOX "Habilitar m\xFAltiples ventanas de comparaci\xF3n para",IDC_STATIC,7,100,
@@ -783,7 +783,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
CONTROL "E&xpresi\xF3n regular",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
- CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",
+ CONTROL "No sobrepasar &fin de fichero",IDC_FINDDLG_DONTWRAP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10
GROUPBOX "Direcci\xF3n",IDC_STATIC,148,23,70,36,WS_GROUP
CONTROL "&Arriba",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
@@ -953,19 +953,19 @@
CONTROL "Ignorar diferencias de tiempo menores de 3 segundos.",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
- GROUPBOX "Integration",IDC_STATIC,7,30,218,46
+ GROUPBOX "Integraci\xF3n",IDC_STATIC,7,30,218,46
CONTROL "&A\xF1adir al men\xFA contextual del explorador.",IDC_EXPLORER_CONTEXT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "Habilitar &men\xFA avanzado",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "In&cluir subdirectorios por defecto",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "Editor e&xterno:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
PUSHBUTTON "&Buscar...",IDC_EXT_EDITOR_BROWSE,179,93,50,14
- LTEXT "&Filter folder:",IDC_STATIC,7,111,166,8
+ LTEXT "&Filtrar directorios:",IDC_STATIC,7,111,166,8
EDITTEXT IDC_FILTER_USER_PATH,7,121,167,14,ES_AUTOHSCROLL
- PUSHBUTTON "Browse...",IDC_FILTER_USER_BROWSE,179,121,50,14
+ PUSHBUTTON "Examinar...",IDC_FILTER_USER_BROWSE,179,121,50,14
END
IDD_GENERATE_PATCH DIALOGEX 0, 0, 340, 180
@@ -1137,8 +1137,8 @@
WS_VSCROLL | WS_TABSTOP
CONTROL "&Parar despu\xE9s de la primera diferencia",IDC_COMPARE_STOPFIRST,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,120,202,10
- GROUPBOX "Comments",IDC_STATIC,7,134,221,32
- CONTROL "Filter Comments",IDC_FILTERCOMMENTS_CHECK,"Button",
+ GROUPBOX "Comentarios",IDC_STATIC,7,134,221,32
+ CONTROL "Filtrar comentarios",IDC_FILTERCOMMENTS_CHECK,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,15,147,205,10
PUSHBUTTON "Por defecto",IDC_COMPARE_DEFAULTS,7,179,50,14
END
@@ -1189,8 +1189,8 @@
CONTROL "List1",IDC_FILTERFILE_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
- PUSHBUTTON "Test",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "Probar",IDC_FILTERFILE_TEST_BTN,7,114,50,14
+ PUSHBUTTON "Instalar...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "Nuevo...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "Editar...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "Eliminar...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1384,7 +1384,7 @@
LTEXT "&Estilo:",IDC_STATIC,7,37,35,8
COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button",
+ CONTROL "&Copiar al Portapapeles",IDC_REPORT_COPYCLIPBOARD,"Button",
BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10
DEFPUSHBUTTON "&Aceptar",IDOK,157,60,50,14
PUSHBUTTON "Cancelar",IDCANCEL,211,60,50,14
@@ -1519,7 +1519,7 @@
CAPTION "Di\xE1logo"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "&Use customized text colors",
+ CONTROL "&Usar colores personalizados para el texto",
IDC_DEFAULT_STANDARD_COLORS,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,25,14,161,10
GROUPBOX "Colores elegidos para texto normal",IDC_CUSTOM_COLORS_GROUP,27,33,159,
@@ -1555,11 +1555,11 @@
RTEXT "&Izquierda:",IDC_STATIC,7,11,40,8
EDITTEXT IDC_PROJ_LFILE_EDIT,50,8,210,14,ES_AUTOHSCROLL
PUSHBUTTON "Examinar...",IDC_PROJ_LFILE_BROWSE,265,8,50,14
- CONTROL "R&ead-only",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
+ CONTROL "S&olo lectura",IDC_PROJFILE_LREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,25,208,10
RTEXT "&Derecha:",IDC_STATIC,7,42,40,8
EDITTEXT IDC_PROJ_RFILE_EDIT,50,40,210,14,ES_AUTOHSCROLL
PUSHBUTTON "Examinar...",IDC_PROJ_RFILE_BROWSE,265,40,50,14
- CONTROL "Re&ad-only",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
+ CONTROL "So&lo lectura",IDC_PROJFILE_RREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,57,208,10
RTEXT "&Filtro:",IDC_STATIC,7,74,40,8
EDITTEXT IDC_PROJ_FILTER_EDIT,50,72,210,14,ES_AUTOHSCROLL
PUSHBUTTON "Seleccionar...",IDC_PROJ_FILTER_SELECT,265,72,50,14
@@ -1749,8 +1749,8 @@
IDS_UNK_ERROR_READING_PROJECT "Error desconocido al intentar abrir el proyecto"
IDS_UNK_ERROR_SAVING_PROJECT "Error desconocido al intentar guardar el proyecto"
IDS_PROJFILEDLG_CAPTION "Fichero de Proyecto"
- IDS_PROJFILE_LOAD_SUCCESS "Project file successfully loaded."
- IDS_PROJFILE_SAVE_SUCCESS "Project file successfully saved."
+ IDS_PROJFILE_LOAD_SUCCESS "Fichero de proyecto cargado con \xE9xito."
+ IDS_PROJFILE_SAVE_SUCCESS "Fichero de proyecto guardado con \xE9xito."
ID_FILE_SAVEPROJECT "Guardar las rutas y opciones actuales al fchero de proyecto\nGuardar Fichero de Proyecto"
END
@@ -1933,7 +1933,7 @@
// WINMERGE COMMAND LINE HELP#1
STRINGTABLE
BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
+ IDS_CMDLINE_SYNTAX "Sintaxis : WinMerge [/r] [/e] [/x] [/s]"
IDS_CMDLINE_SYNTAX_ARGS "rutaizq rutadcha [rutasalida]"
IDS_CMDLINE_SYNTAX_ARG_FILTER "mascara/nombre"
IDS_CMDLINE_SYNTAX_LEFTDESC "descizq"
@@ -1948,12 +1948,12 @@
STRINGTABLE
BEGIN
IDS_CMDLINE_FILEMASK "/f or -f establece la mascara de ficheros o mascara de l\xEDneas para la comparaci\xF3n"
- IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical"
- IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance"
+ IDS_CMDLINE_FASTCLOSE "/x o -x cierra WinMerge si el resultado es identico."
+ IDS_CMDLINE_SINGLE_INST "/s o -s abre la comparaci\xF3n en una instancia de WinMerge existente."
IDS_CMDLINE_LEFTPATH "rutaizq es el directorio o nombre de fichero a ser abierto en el lado izquierdo"
IDS_CMDLINE_RIGHTPATH "rutadcha es el directorio o nombre de fichero a ser abierto en el lado derecho"
IDS_CMDLINE_OUTPUTPATH "rutasalida es un directorio opcional donde se guardaran los ficheros combinados"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
+ IDS_CMDLINE_SEEMANUAL "Lea el manual para una referencia completa de la linea de comandos."
END
// VARIOUS OPTIONS
@@ -1964,7 +1964,7 @@
IDS_DIFF_OPEN_NO_SET_PROPS "Se han realizado modificaciones en los ficheros de la sesion de comparaci\xF3n actual. Algunos ajustes pueden no surtir efecto hasta que la comparaci\xF3n de ficheros se ejecute de nuevo."
IDS_FONT_CHANGE "La fuente seleccionada no se aplicar\xE1 a ninguna de las ventanas de diferencias abiertas actualmente."
IDS_OPTIONS_INVALID_TABSIZE
- "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
+ "Valor en Tama\xF1o de Tab - el valor no esta en el rango aceptado por WinMerge.\n\nPor favor, urilice valores 1 - %1."
END
// BROWSE FILE
@@ -1992,8 +1992,8 @@
IDS_COMPMETHOD_FULL_CONTENTS "Todo el contenido"
IDS_COMPMETHOD_QUICK_CONTENTS "Contenido r\xE1pido"
IDS_COMPMETHOD_MODDATE "Fecha de modificaci\xF3n"
- IDS_COMPMETHOD_DATESIZE "Modified Date and Size"
- IDS_COMPMETHOD_SIZE "Size"
+ IDS_COMPMETHOD_DATESIZE "Fecha de modificaci\xF3n y Tama\xF1o"
+ IDS_COMPMETHOD_SIZE "Tama\xF1o"
END
// FILTER OPTIONS
@@ -2007,18 +2007,18 @@
IDS_FILEFILTER_SAVENEW "Seleccione nombre de fichero para el nuevo filtro"
IDS_FILEFILTER_FILEMASK "Fichero de filtros (*.flt)|*.flt|Todos los archivos(*.*)|*.*||"
IDS_FILEFILTER_TMPL_MISSING
- "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder."
+ "No se pudo encontrar el fichero con la plantilla de filtros de fichero!\n\nPor favor, copie el fichero %1 al directorio WinMerge/Filters."
IDS_FILEFILTER_TMPL_COPY
- "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
+ "No se pudo copiar el fichero con la plantilla de filtros de fichero al directorio:\n%1\n\nPor favor, compruebe que el directorio existe y que tiene permisos de escritura en \xE9l."
IDS_FILEFILTER_NO_USERFOLDER
- "User's filter file folder is not defined!\n\nPlease select filter folder in options/System."
+ "El directorio de filtos de usurio no est\xE1 definido!\n\nPor favor, seleccione el directorio de filtros en Opciones/Sistema."
IDS_FILEFILTER_DELETE_FAIL
- "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
- IDS_FILEFILTER_INSTALL "Locate filter file to install"
+ "Error al borrar el fichero de filtros:\n%1\n\n\xBFQuiza el fichero es de solo lectura?"
+ IDS_FILEFILTER_INSTALL "Seleccione el fichero de filtros a instalar."
IDS_FILEFILTER_INSTALLFAIL
- "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
+ "La instalacion del fichero de filtros ha fallado.\n\nNo se pudo copiar el fichero de filtros al directorio de filtros."
IDS_FILEFILTER_OVERWRITE
- "Filter file already exists. Overwrite existing filter?"
+ "El fichero de filtros ya existe. \xBFDesea sobreescribirlo?"
END
// VERSION CONTROL OPTIONS
@@ -2158,7 +2158,7 @@
ID_DIR_DEL_RIGHT "Eliminar elemento selecionado del lado derecho"
ID_DIR_DEL_BOTH "Eliminar elementos seleccionados de ambos lados"
ID_DIR_HIDE_FILENAMES "Ocultar elementos seleccionados (filtro al vuelo)"
- ID_DIR_ITEM_RENAME "Rename selected item on both sides"
+ ID_DIR_ITEM_RENAME "Renombrar el elemento seleccionado en ambos lados"
IDS_COPY_TO_LEFT "Lado derecho a lado izquierdo (%1)"
IDS_COPY_TO_RIGHT "Lado izquierdo a lado derecho (%1)"
IDS_COPY_TO_LEFT2 "Lado derecho a lado izquierdo (%1 de %2)"
@@ -2267,8 +2267,8 @@
BEGIN
IDS_COLHDR_LENCODING "Codificaci\xF3n izq."
IDS_COLHDR_RENCODING "Codificaci\xF3n dcha."
- IDS_COLHDR_NIDIFFS "Ignored Diff."
- IDS_COLHDR_NSDIFFS "Differences"
+ IDS_COLHDR_NIDIFFS "Difs. ignoradas"
+ IDS_COLHDR_NSDIFFS "Diferencias"
IDS_COLHDR_BINARY "Binario"
END
@@ -2332,8 +2332,8 @@
BEGIN
IDS_COLDESC_LENCODING "Codificaci\xF3n del lado izquierdo."
IDS_COLDESC_RENCODING "Codificaci\xF3n del lado derecho."
- IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
- IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences."
+ IDS_COLDESC_NIDIFFS "N\xFAmero de diferencias ignoradas en el fichero. Estas diferencias son ignoradas por WinMerge y no se pueden combinar."
+ IDS_COLDESC_NSDIFFS "N\xFAmero de diferencias en el fichero. Este n\xFAmero no incluye las diferencias ignoradas."
IDS_COLDESC_BINARY "Muestra un asterisco (*) si el fichero es binario."
END
@@ -2751,8 +2751,8 @@
IDS_EOL_DOS "Win"
IDS_EOL_MAC "Mac"
IDS_EOL_UNIX "Unix"
- IDS_EOL_MIXED "Mixed"
- IDS_EOL_BIN "Binary"
+ IDS_EOL_MIXED "Mezclado"
+ IDS_EOL_BIN "Binario"
END
// Folder compare short size suffixes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-22 15:28:36
|
Revision: 3619
http://svn.sourceforge.net/winmerge/?rev=3619&view=rev
Author: kimmov
Date: 2006-09-22 08:28:28 -0700 (Fri, 22 Sep 2006)
Log Message:
-----------
Quiet warnings from DiffList.cpp
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DiffList.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-22 15:17:09 UTC (rev 3618)
+++ trunk/Src/Changes.txt 2006-09-22 15:28:28 UTC (rev 3619)
@@ -12,7 +12,9 @@
Src/Languages/Catalan: MergeCatalan.rc
PATCH: [ 1563386 ] Spanish translation update
Submitted by Jesus M. Delgado 'Mack'
- Src/Languages/Spanish: MergeSpanish.rc
+ Src/Languages/Spanish: MergeSpanish.rc
+ Quiet warnings from DiffList.cpp
+ Src: DiffList.cpp
2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
Modified: trunk/Src/DiffList.cpp
===================================================================
--- trunk/Src/DiffList.cpp 2006-09-22 15:17:09 UTC (rev 3618)
+++ trunk/Src/DiffList.cpp 2006-09-22 15:28:28 UTC (rev 3619)
@@ -55,7 +55,7 @@
*/
int DiffList::GetSize() const
{
- return m_diffs.GetSize();
+ return (int) m_diffs.GetSize();
}
/**
@@ -67,7 +67,7 @@
int DiffList::GetSignificantDiffs() const
{
int nSignificants = 0;
- const int nDiffCount = m_diffs.GetSize();
+ const int nDiffCount = (int) m_diffs.GetSize();
for (int i = 0; i < nDiffCount; i++)
{
@@ -201,7 +201,7 @@
*/
int DiffList::LineToDiff(UINT nLine) const
{
- const int nDiffCount = m_diffs.GetSize();
+ const int nDiffCount = (int) m_diffs.GetSize();
if (nDiffCount == 0)
return -1;
@@ -255,7 +255,7 @@
if (nDiff == -1)
{
bInDiff = FALSE;
- for (int i = m_diffs.GetSize() - 1; i >= 0 ; i--)
+ for (int i = (int) m_diffs.GetSize() - 1; i >= 0 ; i--)
{
if ((int)DiffRangeAt(i)->dend0 <= nLine)
{
@@ -286,7 +286,7 @@
if (numDiff == -1)
{
bInDiff = FALSE;
- const int nDiffCount = m_diffs.GetSize();
+ const int nDiffCount = (int) m_diffs.GetSize();
for (int i = 0; i < nDiffCount; i++)
{
if ((int)DiffRangeAt(i)->dbegin0 >= nLine)
@@ -320,7 +320,7 @@
{
int nDiff = -1;
- for (int i = m_diffs.GetSize() - 1; i >= 0 ; i--)
+ for (int i = (int) m_diffs.GetSize() - 1; i >= 0 ; i--)
{
const DIFFRANGE * dfi = DiffRangeAt(i);
if (dfi->op != OP_TRIVIAL && dfi->dend0 <= nLine)
@@ -340,7 +340,7 @@
int DiffList::NextSignificantDiffFromLine(UINT nLine) const
{
int nDiff = -1;
- const int nDiffCount = m_diffs.GetSize();
+ const int nDiffCount = (int) m_diffs.GetSize();
for (int i = 0; i < nDiffCount; i++)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-22 16:03:19
|
Revision: 3620
http://svn.sourceforge.net/winmerge/?rev=3620&view=rev
Author: kimmov
Date: 2006-09-22 09:03:08 -0700 (Fri, 22 Sep 2006)
Log Message:
-----------
Some SPECIAL_ITEM_POS cleanups
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirActions.cpp
trunk/Src/DirDoc.cpp
trunk/Src/DirView.cpp
trunk/Src/DirView.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-22 15:28:28 UTC (rev 3619)
+++ trunk/Src/Changes.txt 2006-09-22 16:03:08 UTC (rev 3620)
@@ -15,6 +15,8 @@
Src/Languages/Spanish: MergeSpanish.rc
Quiet warnings from DiffList.cpp
Src: DiffList.cpp
+ Some SPECIAL_ITEM_POS cleanups
+ Src: DirActions.cpp DirDoc.cpp DirView.cpp DirView.h
2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
Modified: trunk/Src/DirActions.cpp
===================================================================
--- trunk/Src/DirActions.cpp 2006-09-22 15:28:28 UTC (rev 3619)
+++ trunk/Src/DirActions.cpp 2006-09-22 16:03:08 UTC (rev 3620)
@@ -985,7 +985,7 @@
while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1)
{
// Don't try to rescan special items
- if (GetItemKey(sel) == (POSITION)SPECIAL_ITEM_POS)
+ if (GetItemKey(sel) == SPECIAL_ITEM_POS)
continue;
DIFFITEM di = GetDiffItem(sel);
@@ -1181,7 +1181,7 @@
BOOL bRenameRight = RenameOnSameDir(sRightFile, szNewItemName);
POSITION key = GetItemKey(nSelItem);
- ASSERT(key != (POSITION)SPECIAL_ITEM_POS);
+ ASSERT(key != SPECIAL_ITEM_POS);
DIFFITEM& di = GetDocument()->GetDiffRefByKey(key);
if ((TRUE == bRenameLeft) && (TRUE == bRenameRight))
Modified: trunk/Src/DirDoc.cpp
===================================================================
--- trunk/Src/DirDoc.cpp 2006-09-22 15:28:28 UTC (rev 3619)
+++ trunk/Src/DirDoc.cpp 2006-09-22 16:03:08 UTC (rev 3620)
@@ -657,7 +657,7 @@
// so there really is not status to update.
if (pos > 0)
{
- int ind = m_pDirView->GetItemIndex((DWORD)pos);
+ int ind = m_pDirView->GetItemIndex(pos);
// Figure out new status code
UINT diffcode = (bIdentical ? DIFFCODE::SAME : DIFFCODE::DIFF);
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2006-09-22 15:28:28 UTC (rev 3619)
+++ trunk/Src/DirView.cpp 2006-09-22 16:03:08 UTC (rev 3620)
@@ -930,7 +930,7 @@
// Now handle the various cases of what was selected
- if (pos1 == (POSITION) SPECIAL_ITEM_POS)
+ if (pos1 == SPECIAL_ITEM_POS)
{
if (!pos2)
{
@@ -1372,7 +1372,7 @@
POSITION diffpos = GetItemKey(sel);
// If it is special item, return empty DIFFITEM
- if (diffpos == (POSITION) SPECIAL_ITEM_POS)
+ if (diffpos == SPECIAL_ITEM_POS)
{
// TODO: It would be better if there were individual items
// for whatever these special items are
@@ -1405,12 +1405,12 @@
* @brief Given key, get index of item which has it stored.
* This function searches from list in UI.
*/
-int CDirView::GetItemIndex(DWORD key)
+int CDirView::GetItemIndex(POSITION key)
{
LVFINDINFO findInfo;
findInfo.flags = LVFI_PARAM; // Search for itemdata
- findInfo.lParam = key;
+ findInfo.lParam = (LPARAM)key;
return m_pList->FindItem(&findInfo);
}
@@ -2387,7 +2387,7 @@
*/
void CDirView::AddParentFolderItem(BOOL bEnable)
{
- AddNewItem(0, (POSITION) SPECIAL_ITEM_POS, bEnable ? DIFFIMG_DIRUP : DIFFIMG_DIRUP_DISABLE);
+ AddNewItem(0, SPECIAL_ITEM_POS, bEnable ? DIFFIMG_DIRUP : DIFFIMG_DIRUP_DISABLE);
}
/**
@@ -2487,7 +2487,7 @@
{
// Don't select special items (SPECIAL_ITEM_POS)
POSITION diffpos = GetItemKey(i);
- if (diffpos != (POSITION) SPECIAL_ITEM_POS)
+ if (diffpos != SPECIAL_ITEM_POS)
m_pList->SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
}
}
@@ -2894,7 +2894,7 @@
CString sIdx, sCnt;
// Don't show number to special items
POSITION pos = GetItemKey(focusItem);
- if (pos != (POSITION) SPECIAL_ITEM_POS)
+ if (pos != SPECIAL_ITEM_POS)
{
// If compare is non-recursive reduce special items count
BOOL bRecursive = GetDocument()->GetRecursive();
@@ -2985,7 +2985,7 @@
{
int nSelItem = m_pList->GetNextItem(-1, LVNI_SELECTED);
ASSERT(-1 != nSelItem);
- return ((POSITION)SPECIAL_ITEM_POS == GetItemKey(nSelItem));
+ return (SPECIAL_ITEM_POS == GetItemKey(nSelItem));
}
/**
Modified: trunk/Src/DirView.h
===================================================================
--- trunk/Src/DirView.h 2006-09-22 15:28:28 UTC (rev 3619)
+++ trunk/Src/DirView.h 2006-09-22 16:03:08 UTC (rev 3620)
@@ -69,7 +69,7 @@
/**
* @brief Position value for special items (..) in directory compare view.
*/
-const int SPECIAL_ITEM_POS = -1;
+const POSITION SPECIAL_ITEM_POS = (POSITION)-1L;
/** Default column width in directory compare */
const UINT DefColumnWidth = 150;
@@ -109,7 +109,7 @@
void UpdateResources();
void LoadColumnHeaderItems();
POSITION GetItemKey(int idx) const;
- int GetItemIndex(DWORD key);
+ int GetItemIndex(POSITION key);
// for populating list
void DeleteAllDisplayItems();
void SetColumnWidths();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-22 18:57:22
|
Revision: 3621
http://svn.sourceforge.net/winmerge/?rev=3621&view=rev
Author: kimmov
Date: 2006-09-22 11:57:08 -0700 (Fri, 22 Sep 2006)
Log Message:
-----------
Fix check for pointer/value by using bit-shift instead of a cast
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/GhostTextBuffer.h
trunk/Src/editlib/ccrystaltextbuffer.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-22 16:03:08 UTC (rev 3620)
+++ trunk/Src/Changes.txt 2006-09-22 18:57:08 UTC (rev 3621)
@@ -17,6 +17,9 @@
Src: DiffList.cpp
Some SPECIAL_ITEM_POS cleanups
Src: DirActions.cpp DirDoc.cpp DirView.cpp DirView.h
+ Fix check for pointer/value by using bit-shift instead of a cast
+ Src: GhostTextBuffer.h
+ Src/editlib: ccrystaltextbuffer.h
2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
Modified: trunk/Src/GhostTextBuffer.h
===================================================================
--- trunk/Src/GhostTextBuffer.h 2006-09-22 16:03:08 UTC (rev 3620)
+++ trunk/Src/GhostTextBuffer.h 2006-09-22 18:57:08 UTC (rev 3621)
@@ -176,8 +176,10 @@
LPCTSTR GetText () const
{
- // see the m_szText/m_pszText definition about the use of HIWORD
- if (HIWORD ((DWORD) m_pszText) != 0)
+ // See the m_szText/m_pszText definition
+ // Check if m_pszText is a pointer by removing bits having
+ // possible char value
+ if (((INT_PTR)m_pszText >> 16) != 0)
return m_pszText;
return m_szText;
};
Modified: trunk/Src/editlib/ccrystaltextbuffer.h
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.h 2006-09-22 16:03:08 UTC (rev 3620)
+++ trunk/Src/editlib/ccrystaltextbuffer.h 2006-09-22 18:57:08 UTC (rev 3621)
@@ -211,8 +211,10 @@
LPCTSTR GetText () const
{
- // see the m_szText/m_pszText definition about the use of HIWORD
- if (HIWORD ((DWORD) m_pszText) != 0)
+ // See the m_szText/m_pszText definition
+ // Check if m_pszText is a pointer by removing bits having
+ // possible char value
+ if (((INT_PTR)m_pszText >> 16) != 0)
return m_pszText;
return m_szText;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-23 07:14:03
|
Revision: 3622
http://svn.sourceforge.net/winmerge/?rev=3622&view=rev
Author: kimmov
Date: 2006-09-23 00:13:53 -0700 (Sat, 23 Sep 2006)
Log Message:
-----------
Couple of type fixes to CMoveConstraint
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/CMoveConstraint.cpp
trunk/Src/Common/CMoveConstraint.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-22 18:57:08 UTC (rev 3621)
+++ trunk/Src/Changes.txt 2006-09-23 07:13:53 UTC (rev 3622)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-23 Kimmo
+ Couple of type fixes to CMoveConstraint
+ Src/Common: CMoveConstraint.cpp CMoveConstraint.h
+
2006-09-22 Kimmo
PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
Src/Common: coretools.cpp coretools.h
Modified: trunk/Src/Common/CMoveConstraint.cpp
===================================================================
--- trunk/Src/Common/CMoveConstraint.cpp 2006-09-22 18:57:08 UTC (rev 3621)
+++ trunk/Src/Common/CMoveConstraint.cpp 2006-09-23 07:13:53 UTC (rev 3622)
@@ -2,7 +2,7 @@
\file CMoveConstraint.cpp
\author Perry Rapp, Creator, 1998-2004
\date Created: 1998
- \date Edited: 2005-07-26 (Perry Rapp)
+ \date Edited: 2006-09-23 (Kimmo Varis)
\brief Implementation of CMoveConstraint
@@ -346,7 +346,7 @@
/**
* Chain to further CSubclass processing if appropriate
*/
-UINT
+LRESULT
CMoveConstraint::CallOriginalProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
#ifndef NOSUBCLASS
@@ -357,7 +357,7 @@
;
#endif // NOSUBCLASS
else
- return 0;
+ return (LRESULT)0;
}
#ifndef NOSUBCLASS
@@ -554,7 +554,7 @@
return false;
if (m_nMinY == m_nMaxY)
{
- int nRet = CallOriginalProc(m_hwndDlg, msg, wParam, lParam);
+ LRESULT nRet = CallOriginalProc(m_hwndDlg, msg, wParam, lParam);
switch(nRet)
{
case HTBOTTOMLEFT:
@@ -574,7 +574,7 @@
}
if (m_nMinX == m_nMaxX)
{
- int nRet = CallOriginalProc(m_hwndDlg, msg, wParam, lParam);
+ LRESULT nRet = CallOriginalProc(m_hwndDlg, msg, wParam, lParam);
switch(nRet)
{
case HTBOTTOMLEFT:
@@ -631,7 +631,7 @@
bool
CMoveConstraint::OnTtnNeedText(TOOLTIPTEXT * pTTT, LRESULT * plresult)
{
- int id = pTTT->hdr.idFrom;
+ UINT id = pTTT->hdr.idFrom;
UINT uflags = pTTT->uFlags;
if (uflags & TTF_IDISHWND)
id = GetDlgCtrlID((HWND)id);
Modified: trunk/Src/Common/CMoveConstraint.h
===================================================================
--- trunk/Src/Common/CMoveConstraint.h 2006-09-22 18:57:08 UTC (rev 3621)
+++ trunk/Src/Common/CMoveConstraint.h 2006-09-23 07:13:53 UTC (rev 3622)
@@ -2,7 +2,7 @@
\file CMoveConstraint.h
\author Perry Rapp, Creator, 1998-2004
\date Created: 1998
- \date Edited: 2005-07-26 (Perry Rapp)
+ \date Edited: 2006-09-23 (Kimmo Varis)
\brief Declaration of CMoveConstraint
@@ -188,7 +188,7 @@
// handle WM_NOTIFY/TTN_NEEDTEXT combination
bool OnTtnNeedText(TOOLTIPTEXT * pTTT, LRESULT * plresult);
// forwarder
- UINT CallOriginalProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+ LRESULT CallOriginalProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
bool PaintGrip();
void ClearMostData();
void DeleteAllConstraints();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-23 07:35:29
|
Revision: 3623
http://svn.sourceforge.net/winmerge/?rev=3623&view=rev
Author: kimmov
Date: 2006-09-23 00:35:20 -0700 (Sat, 23 Sep 2006)
Log Message:
-----------
Fix check for pointer/value by using bit-shift instead of a cast + add trivial typecasts
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/GhostTextBuffer.cpp
trunk/Src/editlib/ccrystaltextbuffer.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-23 07:13:53 UTC (rev 3622)
+++ trunk/Src/Changes.txt 2006-09-23 07:35:20 UTC (rev 3623)
@@ -5,6 +5,9 @@
2006-09-23 Kimmo
Couple of type fixes to CMoveConstraint
Src/Common: CMoveConstraint.cpp CMoveConstraint.h
+ Fix check for pointer/value by using bit-shift instead of a cast + add trivial typecasts
+ Src: GhostTextBuffer.cpp
+ Src/editlib: ccrystaltextbuffer.cpp
2006-09-22 Kimmo
PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
Modified: trunk/Src/GhostTextBuffer.cpp
===================================================================
--- trunk/Src/GhostTextBuffer.cpp 2006-09-23 07:13:53 UTC (rev 3622)
+++ trunk/Src/GhostTextBuffer.cpp 2006-09-23 07:35:20 UTC (rev 3623)
@@ -156,7 +156,7 @@
int nEndLine, int nEndChar,
CString &text, int nCrlfStyle /* CRLF_STYLE_AUTOMATIC */)
{
- int lines = m_aLines.GetSize();
+ int lines = (int) m_aLines.GetSize();
ASSERT(nStartLine >= 0 && nStartLine < lines);
ASSERT(nStartChar >= 0 && nStartChar <= GetLineLength(nStartLine));
ASSERT(nEndLine >= 0 && nEndLine < lines);
@@ -244,7 +244,7 @@
FreeText();
if (pszText != NULL && pszText[0] != _T ('\0'))
{
- int nLength = _tcslen (pszText);
+ int nLength = (int) _tcslen (pszText);
if (nLength > 1)
{
m_pszText = new TCHAR[(nLength + 1) * sizeof (TCHAR)];
@@ -260,8 +260,10 @@
void CGhostTextBuffer::SUndoRecord::
FreeText ()
{
- // see the m_szText/m_pszText definition about the use of HIWORD
- if (HIWORD ((DWORD) m_pszText) != 0)
+ // See the m_szText/m_pszText definition
+ // Check if m_pszText is a pointer by removing bits having
+ // possible char value
+ if (((INT_PTR)m_pszText >> 16) != 0)
delete[] m_pszText;
m_pszText = NULL;
}
@@ -420,7 +422,7 @@
}
// restore line revision numbers
- int i, naSavedRevisonNumbersSize = ur.m_paSavedRevisonNumbers->GetSize();
+ int i, naSavedRevisonNumbersSize = (int) ur.m_paSavedRevisonNumbers->GetSize();
for (i = 0; i < naSavedRevisonNumbersSize; i++)
m_aLines[apparent_ptStartPos.y + i].m_dwRevisionNumber = (*ur.m_paSavedRevisonNumbers)[i];
@@ -554,7 +556,7 @@
ASSERT (m_aUndoBuf.GetSize () == 0 || (m_aUndoBuf[0].m_dwFlags & UNDO_BEGINGROUP) != 0);
// Strip unnecessary undo records (edit after undo wipes all potential redo records)
- int nBufSize = m_aUndoBuf.GetSize ();
+ int nBufSize = (int) m_aUndoBuf.GetSize ();
if (m_nUndoPosition < nBufSize)
{
m_aUndoBuf.SetSize (m_nUndoPosition);
@@ -562,7 +564,7 @@
// If undo buffer size is close to critical, remove the oldest records
ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize);
- nBufSize = m_aUndoBuf.GetSize ();
+ nBufSize = (int) m_aUndoBuf.GetSize ();
if (nBufSize >= m_nUndoBufSize)
{
int nIndex = 0;
@@ -620,7 +622,7 @@
ur.m_paSavedRevisonNumbers = paSavedRevisonNumbers;
m_aUndoBuf.Add (ur);
- m_nUndoPosition = m_aUndoBuf.GetSize ();
+ m_nUndoPosition = (int) m_aUndoBuf.GetSize ();
ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize);
}
@@ -893,7 +895,7 @@
*/
int CGhostTextBuffer::ApparentLastRealLine() const
{
- int bmax = m_RealityBlocks.GetUpperBound();
+ int bmax = (int) m_RealityBlocks.GetUpperBound();
if (bmax<0) return -1;
const RealityBlock & block = m_RealityBlocks[bmax];
return block.nStartApparent + block.nCount - 1;
@@ -911,7 +913,7 @@
*/
int CGhostTextBuffer::ComputeRealLine(int nApparentLine) const
{
- int bmax = m_RealityBlocks.GetUpperBound();
+ int bmax = (int) m_RealityBlocks.GetUpperBound();
// first get the degenerate cases out of the way
// empty file ?
if (bmax<0)
@@ -949,7 +951,7 @@
*/
int CGhostTextBuffer::ComputeApparentLine(int nRealLine) const
{
- int bmax = m_RealityBlocks.GetUpperBound();
+ int bmax = (int) m_RealityBlocks.GetUpperBound();
// first get the degenerate cases out of the way
// empty file ?
if (bmax<0)
@@ -990,7 +992,7 @@
*/
int CGhostTextBuffer::ComputeRealLineAndGhostAdjustment(int nApparentLine, int& decToReal) const
{
- int bmax = m_RealityBlocks.GetUpperBound();
+ int bmax = (int) m_RealityBlocks.GetUpperBound();
// first get the degenerate cases out of the way
// empty file ?
if (bmax<0)
@@ -1044,7 +1046,7 @@
int blo, bhi;
int nPreviousBlock;
int nApparent;
- int bmax = m_RealityBlocks.GetUpperBound();
+ int bmax = (int) m_RealityBlocks.GetUpperBound();
// first get the degenerate cases out of the way
// empty file ?
if (bmax<0)
@@ -1194,7 +1196,7 @@
if (m_aLines[i].m_nEolChars == 0)
{
// if a real line (not the last) has no EOL, add one
- AppendLine (i, GetDefaultEol(), _tcslen(GetDefaultEol()));
+ AppendLine (i, GetDefaultEol(), (int) _tcslen(GetDefaultEol()));
if (pSource!=NULL)
UpdateViews (pSource, NULL, UPDATE_HORZRANGE | UPDATE_SINGLELINE, i);
}
@@ -1220,7 +1222,7 @@
*/
void CGhostTextBuffer::checkFlagsFromReality(BOOL bFlag) const
{
- int bmax = m_RealityBlocks.GetUpperBound();
+ int bmax = (int) m_RealityBlocks.GetUpperBound();
int b;
int i = 0;
for (b = 0 ; b <= bmax ; b ++)
Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.cpp 2006-09-23 07:13:53 UTC (rev 3622)
+++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2006-09-23 07:35:20 UTC (rev 3623)
@@ -98,7 +98,7 @@
FreeText();
if (pszText != NULL && pszText[0] != _T ('\0'))
{
- int nLength = _tcslen (pszText);
+ int nLength = (int) _tcslen (pszText);
if (nLength > 1)
{
m_pszText = new TCHAR[(nLength + 1) * sizeof (TCHAR)];
@@ -114,8 +114,10 @@
void CCrystalTextBuffer::SUndoRecord::
FreeText ()
{
- // see the m_szText/m_pszText definition about the use of HIWORD
- if (HIWORD ((DWORD) m_pszText) != 0)
+ // See the m_szText/m_pszText definition
+ // Check if m_pszText is a pointer by removing bits having
+ // possible char value
+ if (((INT_PTR)m_pszText >> 16) != 0)
delete[] m_pszText;
m_pszText = NULL;
}
@@ -230,7 +232,7 @@
if (pszLine == NULL)
nLength = 0;
else
- nLength = _tcslen (pszLine);
+ nLength = (int) _tcslen (pszLine);
}
SLineInfo li;
@@ -255,7 +257,7 @@
// nPosition not defined ? Insert at end of array
if (nPosition == -1)
- nPosition = m_aLines.GetSize();
+ nPosition = (int) m_aLines.GetSize();
// insert all lines in one pass
m_aLines.InsertAt (nPosition, li, nCount);
@@ -270,7 +272,7 @@
#ifdef _DEBUG
// Warning : this function is also used during rescan
// and this trace will appear even after the initial load
- int nLines = m_aLines.GetSize ();
+ int nLines = (int) m_aLines.GetSize ();
if (nLines / 5000 != (nLines-nCount) / 5000)
TRACE1 ("%d lines loaded!\n", nLines);
#endif
@@ -285,7 +287,7 @@
{
if (pszChars == NULL)
return;
- nLength = _tcslen (pszChars);
+ nLength = (int) _tcslen (pszChars);
}
if (nLength == 0)
@@ -378,7 +380,7 @@
FreeAll ()
{
// Free text
- int nCount = m_aLines.GetSize ();
+ int nCount = (int) m_aLines.GetSize ();
for (int I = 0; I < nCount; I++)
{
if (m_aLines[I].m_nMax > 0)
@@ -770,7 +772,7 @@
ASSERT (m_bInit); // Text buffer not yet initialized.
// You must call InitNew() or LoadFromFile() first!
- return m_aLines.GetSize ();
+ return (int) m_aLines.GetSize ();
}
// number of characters in line (excluding any trailing eol characters)
@@ -808,7 +810,7 @@
ChangeLineEol (int nLine, LPCTSTR lpEOL)
{
register SLineInfo & li = m_aLines[nLine];
- int nNewEolChars = _tcslen(lpEOL);
+ int nNewEolChars = (int) _tcslen(lpEOL);
if (nNewEolChars == li.m_nEolChars)
if (_tcscmp(li.m_pcLine + li.Length(), lpEOL) == 0)
return FALSE;
@@ -886,7 +888,7 @@
int CCrystalTextBuffer::
FindLineWithFlag (DWORD dwFlag)
{
- int nSize = m_aLines.GetSize ();
+ int nSize = (int) m_aLines.GetSize ();
for (int L = 0; L < nSize; L++)
{
if ((m_aLines[L].m_dwFlags & dwFlag) != 0)
@@ -999,7 +1001,7 @@
if (pszCRLF == NULL)
pszCRLF = crlf;
- int nCRLFLength = _tcslen (pszCRLF);
+ int nCRLFLength = (int) _tcslen (pszCRLF);
ASSERT (nCRLFLength > 0);
int nBufSize = 0;
@@ -1504,7 +1506,7 @@
}
// restore line revision numbers
- int i, naSavedRevisonNumbersSize = ur.m_paSavedRevisonNumbers->GetSize();
+ int i, naSavedRevisonNumbersSize = (int) ur.m_paSavedRevisonNumbers->GetSize();
for (i = 0; i < naSavedRevisonNumbersSize; i++)
m_aLines[ur.m_ptStartPos.y + i].m_dwRevisionNumber = (*ur.m_paSavedRevisonNumbers)[i];
@@ -1586,7 +1588,7 @@
ASSERT (m_aUndoBuf.GetSize () == 0 || (m_aUndoBuf[0].m_dwFlags & UNDO_BEGINGROUP) != 0);
// Strip unnecessary undo records (edit after undo wipes all potential redo records)
- int nBufSize = m_aUndoBuf.GetSize ();
+ int nBufSize = (int) m_aUndoBuf.GetSize ();
if (m_nUndoPosition < nBufSize)
{
m_aUndoBuf.SetSize (m_nUndoPosition);
@@ -1594,7 +1596,7 @@
// If undo buffer size is close to critical, remove the oldest records
ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize);
- nBufSize = m_aUndoBuf.GetSize ();
+ nBufSize = (int) m_aUndoBuf.GetSize ();
if (nBufSize >= m_nUndoBufSize)
{
int nIndex = 0;
@@ -1646,14 +1648,14 @@
ur.m_paSavedRevisonNumbers = paSavedRevisonNumbers;
m_aUndoBuf.Add (ur);
- m_nUndoPosition = m_aUndoBuf.GetSize ();
+ m_nUndoPosition = (int) m_aUndoBuf.GetSize ();
ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize);
}
static BOOL HasEol(LPCTSTR szText)
{
- int len = _tcslen(szText);
+ int len = (int) _tcslen(szText);
return (len && iseol(szText[len-1]));
}
@@ -1884,7 +1886,7 @@
if ((dwFlags & LF_BOOKMARKS) != 0)
nCurrentLine++;
- int nSize = m_aLines.GetSize ();
+ int nSize = (int) m_aLines.GetSize ();
for (;;)
{
while (nCurrentLine < nSize)
@@ -1913,7 +1915,7 @@
if ((dwFlags & LF_BOOKMARKS) != 0)
nCurrentLine--;
- int nSize = m_aLines.GetSize ();
+ int nSize = (int) m_aLines.GetSize ();
for (;;)
{
while (nCurrentLine >= 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-24 08:14:47
|
Revision: 3626
http://svn.sourceforge.net/winmerge/?rev=3626&view=rev
Author: kimmov
Date: 2006-09-24 01:14:37 -0700 (Sun, 24 Sep 2006)
Log Message:
-----------
PATCH: [ 1564280 ] Stack corruption in LanguageSelect
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/LanguageSelect.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-23 20:16:47 UTC (rev 3625)
+++ trunk/Src/Changes.txt 2006-09-24 08:14:37 UTC (rev 3626)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-24 Kimmo
+ PATCH: [ 1564280 ] Stack corruption in LanguageSelect
+ Src/Common: LanguageSelect.cpp
+
2006-09-23 Kimmo
Couple of type fixes to CMoveConstraint
Src/Common: CMoveConstraint.cpp CMoveConstraint.h
Modified: trunk/Src/Common/LanguageSelect.cpp
===================================================================
--- trunk/Src/Common/LanguageSelect.cpp 2006-09-23 20:16:47 UTC (rev 3625)
+++ trunk/Src/Common/LanguageSelect.cpp 2006-09-24 08:14:37 UTC (rev 3626)
@@ -817,14 +817,14 @@
static WORD
GetLangFromLocale(LCID lcid)
{
- TCHAR buff[8];
- if (GetLocaleInfo(lcid, LOCALE_IDEFAULTLANGUAGE, buff, countof(buff)))
- {
- LANGID langid = 0;
- if (1 == _stscanf(buff, _T("%x"), &langid) && langid)
- return langid;
- }
- return -1;
+ TCHAR buff[8] = {0};
+ if (GetLocaleInfo(lcid, LOCALE_IDEFAULTLANGUAGE, buff, countof(buff)))
+ {
+ int langID = 0;
+ if ((1 == _stscanf(buff, _T("%4x"), &langID)) && langID)
+ return (WORD)langID;
+ }
+ return (WORD)-1;
}
void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ga...@us...> - 2006-09-24 09:54:45
|
Revision: 3633
http://svn.sourceforge.net/winmerge/?rev=3633&view=rev
Author: galh
Date: 2006-09-24 02:54:27 -0700 (Sun, 24 Sep 2006)
Log Message:
-----------
BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-24 08:53:00 UTC (rev 3632)
+++ trunk/Src/Changes.txt 2006-09-24 09:54:27 UTC (rev 3633)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-24 Gal
+ BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
+ Src: MergeDoc.cpp
+
2006-09-24 Kimmo
PATCH: [ 1564280 ] Stack corruption in LanguageSelect
Src/Common: LanguageSelect.cpp
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-09-24 08:53:00 UTC (rev 3632)
+++ trunk/Src/MergeDoc.cpp 2006-09-24 09:54:27 UTC (rev 3633)
@@ -2869,6 +2869,10 @@
{
ShowRescanError(nRescanResult, bBinary, bIdentical);
}
+
+ // Exit if files are identical should only work for the first
+ // comparison and must be disabled afterward.
+ GetMainFrame()->m_bExitIfNoDiff = FALSE;
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-25 22:05:53
|
Revision: 3642
http://svn.sourceforge.net/winmerge/?rev=3642&view=rev
Author: kimmov
Date: 2006-09-25 15:05:46 -0700 (Mon, 25 Sep 2006)
Log Message:
-----------
PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
- submitted by Jordi Vilar
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Catalan/MergeCatalan.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-25 21:55:18 UTC (rev 3641)
+++ trunk/Src/Changes.txt 2006-09-25 22:05:46 UTC (rev 3642)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-25 Kimmo
+ PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
+ Submitted by Jordi Vilar
+ Src/Languages/Catalan: MergeCatalan.rc
+
2006-09-24 Gal
BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
Src: MergeDoc.cpp
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-25 21:55:18 UTC (rev 3641)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-25 22:05:46 UTC (rev 3642)
@@ -647,38 +647,38 @@
PUSHBUTTON "Col\xB7laboradors",IDC_OPEN_CONTRIBUTORS,7,103,65,14
END
-IDD_OPEN DIALOGEX 0, 0, 376, 126
+IDD_OPEN DIALOGEX 0, 0, 374, 126
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
CAPTION "Tria de fitxers o directoris..."
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
RTEXT "&Esquerra:",IDC_STATIC,13,24,65,8
- COMBOBOX IDC_LEFT_COMBO,81,22,162,94,CBS_DROPDOWN |
+ COMBOBOX IDC_LEFT_COMBO,81,22,167,94,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
WS_EX_ACCEPTFILES
- PUSHBUTTON "&Navega...",IDC_LEFT_BUTTON,242,22,50,14
+ PUSHBUTTON "&Navega...",IDC_LEFT_BUTTON,252,22,50,14
RTEXT "&Dreta:",IDC_STATIC,13,40,65,8
- COMBOBOX IDC_RIGHT_COMBO,81,38,162,95,CBS_DROPDOWN |
+ COMBOBOX IDC_RIGHT_COMBO,81,38,167,95,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
WS_EX_ACCEPTFILES
- PUSHBUTTON "N&avega...",IDC_RIGHT_BUTTON,242,38,50,14
+ PUSHBUTTON "N&avega...",IDC_RIGHT_BUTTON,252,38,50,14
RTEXT "&Filtre:",IDC_STATIC,13,56,65,8
- COMBOBOX IDC_EXT_COMBO,81,54,162,95,CBS_DROPDOWN |
+ COMBOBOX IDC_EXT_COMBO,81,54,167,95,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "&Tria...",IDC_SELECT_FILTER,242,54,50,14
- RTEXT "Desem&paquetador:",IDC_STATIC,9,72,65,8
- EDITTEXT IDC_UNPACKER_EDIT,81,70,162,12,ES_AUTOHSCROLL |
+ PUSHBUTTON "&Tria...",IDC_SELECT_FILTER,252,54,50,14
+ RTEXT "Desem&paquetador:",IDC_STATIC,13,72,65,8
+ EDITTEXT IDC_UNPACKER_EDIT,81,70,167,12,ES_AUTOHSCROLL |
ES_READONLY
- PUSHBUTTON "T&ria...",IDC_SELECT_UNPACKER,242,70,50,14
+ PUSHBUTTON "T&ria...",IDC_SELECT_UNPACKER,252,70,50,14
CONTROL "&Inclou-hi les subcarpetes",IDC_RECURS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,81,86,161,10
- LTEXT "Estat:",IDC_OPEN_STATUS,15,102,182,8
- DEFPUSHBUTTON "D'acord",IDOK,306,11,62,14
- PUSHBUTTON "Cancel\xB7la",IDCANCEL,306,28,62,14
- PUSHBUTTON "Ajuda",ID_HELP,306,45,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,81,86,167,10
+ LTEXT "Estat:",IDC_OPEN_STATUS,15,102,192,8
+ DEFPUSHBUTTON "D'acord",IDOK,316,11,50,14
+ PUSHBUTTON "Cancel\xB7la",IDCANCEL,316,28,50,14
+ PUSHBUTTON "Ajuda",ID_HELP,316,45,50,14
GROUPBOX "Fitxers o directoris a comparar",IDC_FILES_DIRS_GROUP,7,
- 7,292,111
+ 7,302,111
END
IDD_VSS DIALOGEX 0, 0, 257, 166
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-26 15:18:46
|
Revision: 3643
http://svn.sourceforge.net/winmerge/?rev=3643&view=rev
Author: kimmov
Date: 2006-09-26 08:18:40 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/coretools.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-25 22:05:46 UTC (rev 3642)
+++ trunk/Src/Changes.txt 2006-09-26 15:18:40 UTC (rev 3643)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-26 Kimmo
+ PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
+ Src/Common: coretools.cpp
+
2006-09-25 Kimmo
PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
Submitted by Jordi Vilar
Modified: trunk/Src/Common/coretools.cpp
===================================================================
--- trunk/Src/Common/coretools.cpp 2006-09-25 22:05:46 UTC (rev 3642)
+++ trunk/Src/Common/coretools.cpp 2006-09-26 15:18:40 UTC (rev 3643)
@@ -489,17 +489,22 @@
BOOL FindAnyFile(LPTSTR filespec, LPTSTR name)
{
-#ifndef _UNICODE
- struct __finddata64_t c_file;
+// Use 64-bit versions with VS2003.Net and later
+#if _MSC_VER >= 1300
+ _tfinddata64_t c_file;
+ intptr_t hFile;
+ hFile = _tfindfirst64( filespec, &c_file );
#else
- struct __wfinddata64_t c_file;
-#endif
- intptr_t hFile;
+// Use 32-bit versions with VC6
+ _tfinddata_t c_file;
+ long hFile;
+ hFile = _tfindfirst( filespec, &c_file );
+#endif // _MSC_VER >= 1300
- if( (hFile = _tfindfirst64( filespec, &c_file )) == -1L )
- return FALSE;
+ if (hFile == -1L)
+ return FALSE;
- _tcscpy(name, c_file.name);
+ _tcscpy(name, c_file.name);
_findclose( hFile );
return TRUE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-26 19:46:44
|
Revision: 3647
http://svn.sourceforge.net/winmerge/?rev=3647&view=rev
Author: gerundt
Date: 2006-09-26 12:46:35 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/German/MergeGerman.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-26 16:12:02 UTC (rev 3646)
+++ trunk/Src/Changes.txt 2006-09-26 19:46:35 UTC (rev 3647)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-26 Tim
+ PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
+ Src/Languages/German: MergeGerman.rc
+
2006-09-26 Kimmo
PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
Src/Common: coretools.cpp
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-09-26 16:12:02 UTC (rev 3646)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-09-26 19:46:35 UTC (rev 3647)
@@ -219,7 +219,7 @@
MENUITEM "L&inks schreibgesch\xFCtzt", ID_FILE_LEFT_READONLY
MENUITEM "R&echts schreibgesch\xFCtzt", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- MENUITEM "File En&coding", ID_FILE_ENCODING
+ MENUITEM "Dateik&odierung", ID_FILE_ENCODING
MENUITEM SEPARATOR
MENUITEM "&Beenden", ID_APP_EXIT
END
@@ -774,7 +774,7 @@
CAPTION "Suchen"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "S&uchen nach:",IDC_STATIC,7,9,50,8
+ LTEXT "&Suchen nach:",IDC_STATIC,7,9,50,8
COMBOBOX IDC_EDIT_FINDTEXT,59,7,160,65,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "&Nur ganze W\xF6rter",IDC_EDIT_WHOLE_WORD,"Button",
@@ -783,7 +783,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10
CONTROL "&Regul\xE4re Ausdr\xFCcke",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
- CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",
+ CONTROL "Nicht am Dateiende um&brechen",IDC_FINDDLG_DONTWRAP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10
GROUPBOX "Richtung",IDC_STATIC,148,23,70,36,WS_GROUP
CONTROL "nach &oben",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
@@ -800,7 +800,7 @@
CAPTION "Ersetzen"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- LTEXT "S&uchen nach:",IDC_STATIC,7,9,65,8
+ LTEXT "&Suchen nach:",IDC_STATIC,7,9,65,8
COMBOBOX IDC_EDIT_FINDTEXT,75,7,165,66,CBS_DROPDOWN |
CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
LTEXT "Erse&tzen durch:",IDC_STATIC,7,24,65,8
@@ -812,7 +812,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10
CONTROL "&Regul\xE4re Ausdr\xFCcke",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,64,135,10
- CONTROL "Nicht das Dateiende umbrechen",IDC_EDIT_SCOPE_DONT_WRAP,"Button",
+ CONTROL "Nicht am Dateiende um&brechen",IDC_EDIT_SCOPE_DONT_WRAP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,74,135,10
GROUPBOX "Ersetze in",IDC_STATIC,149,40,90,36,WS_GROUP
CONTROL "&Auswahl",IDC_EDIT_SCOPE_SELECTION,"Button",
@@ -1471,28 +1471,28 @@
IDD_LOAD_SAVE_CODEPAGE DIALOGEX 0, 0, 178, 138
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
-CAPTION "Codepage"
+CAPTION "Zeichensatz"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Affects",IDC_AFFECTS_GROUP,5,7,166,36
- CONTROL "&Left",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX |
+ GROUPBOX "Betrifft",IDC_AFFECTS_GROUP,5,7,166,36
+ CONTROL "&Links",IDC_AFFECTS_LEFT_BTN,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,12,18,54,8
LTEXT "(Affects)",IDC_LEFT_FILES_LABEL,70,18,93,8
- CONTROL "&Right",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX |
+ CONTROL "&Rechts",IDC_AFFECTS_RIGHT_BTN,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,12,29,54,8
LTEXT "(Affects)",IDC_RIGHT_FILES_LABEL,70,29,93,8
- GROUPBOX "Select Codepage for",IDC_LOADING_GROUP,5,48,166,63
- LTEXT "&File Loading:",IDC_LOAD_FILES_LABEL,12,64,72,10
+ GROUPBOX "Zeichensatz ausw\xE4hlen f\xFCr",IDC_LOADING_GROUP,5,48,166,63
+ LTEXT "&Datei laden:",IDC_LOAD_FILES_LABEL,12,64,72,10
EDITTEXT IDC_LOAD_CODEPAGE_TEXTBOX,86,63,45,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_LOAD_CODEPAGE_BROWSE,139,64,23,10
- LTEXT "File &Saving:",IDC_SAVE_FILES_LABEL,12,79,67,10
+ LTEXT "Datei &speichern:",IDC_SAVE_FILES_LABEL,12,79,67,10
EDITTEXT IDC_SAVE_CODEPAGE_TEXTBOX,86,79,45,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_SAVE_CODEPAGE_BROWSE,139,80,23,10
- CONTROL "&Use same codepage for both",
+ CONTROL "&Gleichen Zeichensatz f\xFCr Beide verwenden",
IDC_LOAD_SAVE_SAME_CODEPAGE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,12,96,150,10
- DEFPUSHBUTTON "&Apply",IDOK,65,117,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,121,117,50,14
+ DEFPUSHBUTTON "An&wenden",IDOK,65,117,50,14
+ PUSHBUTTON "&Abbruch",IDCANCEL,121,117,50,14
END
IDD_TEST_FILTER DIALOGEX 0, 0, 249, 142
@@ -1748,9 +1748,9 @@
ID_FILE_OPENPROJECT "\xD6ffnet eine Projektdatei.\nProjektdatei (Strg+J)"
IDS_UNK_ERROR_READING_PROJECT "Unbekannter Fehler beim Versuch die Projektdatei zu \xF6ffnen."
IDS_UNK_ERROR_SAVING_PROJECT "Unbekannter Fehler beim Versuch die Projektdatei zu speichern."
- IDS_PROJFILEDLG_CAPTION "Projekt-Datei"
- IDS_PROJFILE_LOAD_SUCCESS "Project file successfully loaded."
- IDS_PROJFILE_SAVE_SUCCESS "Project file successfully saved."
+ IDS_PROJFILEDLG_CAPTION "Projektdatei"
+ IDS_PROJFILE_LOAD_SUCCESS "Projektdatei erfolgreich geladen."
+ IDS_PROJFILE_SAVE_SUCCESS "Projektdatei erfolgreich gespeichert."
ID_FILE_SAVEPROJECT "Speichert die aktuellen Pfade und Einstellungen in eine Projektdatei.\nProjektdatei speichern"
END
@@ -1948,12 +1948,12 @@
STRINGTABLE
BEGIN
IDS_CMDLINE_FILEMASK "/f oder -f setzt die Dateimaske oder den Filtername f\xFCr den Vergleich"
- IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical"
- IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance"
+ IDS_CMDLINE_FASTCLOSE "/x oder -x schlie\xDFt WinMerge, wenn das Ergebnis identisch ist"
+ IDS_CMDLINE_SINGLE_INST "/s oder -s \xF6ffnet Pfade zur bestehenden WinMerge-Instanz"
IDS_CMDLINE_LEFTPATH "LinkerPfad ist das Verzeichnis oder der Dateiname zum \xD6ffnen auf der linken Seite"
IDS_CMDLINE_RIGHTPATH "RechterPfad ist das Verzeichnis oder der Dateiname zum \xD6ffnen auf der rechten Seite"
IDS_CMDLINE_OUTPUTPATH "AusgabePfad ist ein optionales Ausgabeverzeichnis, in dem Sie die vermischten Dateien speichern m\xF6chten"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
+ IDS_CMDLINE_SEEMANUAL "Sehen Sie ins Handbuch f\xFCr eine komplette Befehlszeilen-Referenz."
END
// VARIOUS OPTIONS
@@ -1993,7 +1993,7 @@
IDS_COMPMETHOD_QUICK_CONTENTS "Schneller Inhalt"
IDS_COMPMETHOD_MODDATE "\xC4nderungsdatum"
IDS_COMPMETHOD_DATESIZE "\xC4nderungsdatum und Gr\xF6\xDFe"
- IDS_COMPMETHOD_SIZE "Size"
+ IDS_COMPMETHOD_SIZE "Gr\xF6\xDFe"
END
// FILTER OPTIONS
@@ -2267,8 +2267,8 @@
BEGIN
IDS_COLHDR_LENCODING "Linke Kodierung"
IDS_COLHDR_RENCODING "Rechte Kodierung"
- IDS_COLHDR_NIDIFFS "Ignored Diff."
- IDS_COLHDR_NSDIFFS "Differences"
+ IDS_COLHDR_NIDIFFS "Ignorierte Unter."
+ IDS_COLHDR_NSDIFFS "Unterschiede"
IDS_COLHDR_BINARY "Bin\xE4r"
END
@@ -2332,8 +2332,8 @@
BEGIN
IDS_COLDESC_LENCODING "Linke Zeichensatz-Kodierung."
IDS_COLDESC_RENCODING "Rechte Zeichensatz-Kodierung."
- IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
- IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences."
+ IDS_COLDESC_NIDIFFS "Anzahl der ignorierten Unterschiede in der Datei. Diese Unterschiede werden von WinMerge ignoriert und k\xF6nnen nicht vermischt werden."
+ IDS_COLDESC_NSDIFFS "Anzahl der Unterschiede in der Datei. Die Zahl enth\xE4lt nicht die ignorierten Unterschiede."
IDS_COLDESC_BINARY "Zeigt ein Asterisk (*), wenn die Datei bin\xE4r ist."
END
@@ -2376,7 +2376,7 @@
// Encoding issues
STRINGTABLE
BEGIN
- IDS_SUGGEST_IGNORECODEPAGE "Die linke (cp%d) und rechte (cp%d) Datei haben nicht den gleichen Zeichensatz.\nDas Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gef\xE4hrlich.\nWould you like to treat both files as being in the default windows codepage (recommended)?"
+ IDS_SUGGEST_IGNORECODEPAGE "Die linke (cp%d) und rechte (cp%d) Datei haben nicht den gleichen Zeichensatz.\nDas Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gef\xE4hrlich.\nWollen Sie like to treat both files as being in the default windows codepage (recommended)?"
IDS_DIFFERENT_UNICODINGS "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
IDS_LOSSY_TRANSCODING_BOTH "Information lost due to encoding errors: both files"
IDS_LOSSY_TRANSCODING_RIGHT "Information lost due to encoding errors: right file"
@@ -2780,7 +2780,7 @@
ID_EOL_TO_UNIX "Konvertiert Zeilenumbr\xFCche ins UNIX Format."
ID_EOL_TO_MAC "Konvertiert Zeilenumbr\xFCche ins MAC Format."
ID_FILE_MERGINGMODE "Wechselt zwischen Bearbeitungs- und Merging-Modus."
- ID_FILE_ENCODING "View and adjust file encoding properties\nFile encoding properties"
+ ID_FILE_ENCODING "Zeigt und passt die Dateikodierungs-Eigenschaften an.\nDateikodierungs-Eigenschaften"
END
// EDIT MENU
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-27 14:32:23
|
Revision: 3652
http://svn.sourceforge.net/winmerge/?rev=3652&view=rev
Author: kimmov
Date: 2006-09-27 07:32:16 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
BUG: [ 1563187 ] Can't close a file compare with -e switch
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-27 14:29:37 UTC (rev 3651)
+++ trunk/Src/Changes.txt 2006-09-27 14:32:16 UTC (rev 3652)
@@ -5,6 +5,8 @@
2006-09-27 Kimmo
PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
ShellExtension: Register.bat
+ BUG: [ 1563187 ] Can't close a file compare with -e switch
+ Src: MergeDoc.cpp
2006-09-26 Tim
PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-09-27 14:29:37 UTC (rev 3651)
+++ trunk/Src/MergeDoc.cpp 2006-09-27 14:32:16 UTC (rev 3652)
@@ -1253,7 +1253,7 @@
BOOL CMergeDoc::CanCloseFrame(CFrameWnd* /*pFrame*/)
{
// Allow user to cancel closing
- if (!GetMainFrame()->m_bEscShutdown && PromptAndSaveIfNeeded(TRUE))
+ if (PromptAndSaveIfNeeded(TRUE))
{
// Set modified status to false so that we are not asking
// about saving again in OnCloseDocument()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-09-27 15:32:10
|
Revision: 3654
http://svn.sourceforge.net/winmerge/?rev=3654&view=rev
Author: sdottaka
Date: 2006-09-27 08:31:58 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
BUG: [ 1564572 ] Leak memory on undoing
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/GhostTextBuffer.h
trunk/Src/editlib/ccrystaltextbuffer.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-27 15:30:19 UTC (rev 3653)
+++ trunk/Src/Changes.txt 2006-09-27 15:31:58 UTC (rev 3654)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-27 Takashi
+ BUG: [ 1564572 ] Leak memory on undoing
+ Src: GhostTextBuffer.h
+ Src/editlib: ccrystaltextbuffer.h
+
2006-09-27 Kimmo
PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
ShellExtension: Register.bat
Modified: trunk/Src/GhostTextBuffer.h
===================================================================
--- trunk/Src/GhostTextBuffer.h 2006-09-27 15:30:19 UTC (rev 3653)
+++ trunk/Src/GhostTextBuffer.h 2006-09-27 15:31:58 UTC (rev 3654)
@@ -157,7 +157,8 @@
m_nRealLinesInDeletedBlock = src.m_nRealLinesInDeletedBlock;
SetText(src.GetText());
INT_PTR size = src.m_paSavedRevisonNumbers->GetSize();
- m_paSavedRevisonNumbers = new CDWordArray();
+ if (!m_paSavedRevisonNumbers)
+ m_paSavedRevisonNumbers = new CDWordArray();
m_paSavedRevisonNumbers->SetSize(size);
INT_PTR i;
for (i = 0; i < size; i++)
Modified: trunk/Src/editlib/ccrystaltextbuffer.h
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.h 2006-09-27 15:30:19 UTC (rev 3653)
+++ trunk/Src/editlib/ccrystaltextbuffer.h 2006-09-27 15:31:58 UTC (rev 3654)
@@ -192,7 +192,8 @@
m_nAction = src.m_nAction;
SetText(src.GetText());
INT_PTR size = src.m_paSavedRevisonNumbers->GetSize();
- m_paSavedRevisonNumbers = new CDWordArray();
+ if (!m_paSavedRevisonNumbers)
+ m_paSavedRevisonNumbers = new CDWordArray();
m_paSavedRevisonNumbers->SetSize(size);
INT_PTR i;
for (i = 0; i < size; i++)
@@ -203,7 +204,7 @@
{
FreeText();
if (m_paSavedRevisonNumbers)
- delete m_paSavedRevisonNumbers;
+ delete m_paSavedRevisonNumbers;
}
void SetText (LPCTSTR pszText);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X