Thread: [Winmerge-svn] SF.net SVN: winmerge:[7278] branches/R2_14/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <jt...@us...> - 2010-09-24 06:25:07
|
Revision: 7278 http://winmerge.svn.sourceforge.net/winmerge/?rev=7278&view=rev Author: jtuc Date: 2010-09-24 06:25:00 +0000 (Fri, 24 Sep 2010) Log Message: ----------- Merge HexMerge* changes from trunk. This does not reenable the feature though, as decision whether to do so is up to Kimmo. Modified Paths: -------------- branches/R2_14/Src/HexMergeDoc.cpp branches/R2_14/Src/HexMergeDoc.h branches/R2_14/Src/HexMergeFrm.cpp branches/R2_14/Src/HexMergeFrm.h branches/R2_14/Src/HexMergeView.cpp branches/R2_14/Src/HexMergeView.h Added Paths: ----------- branches/R2_14/Src/heksedit.h Modified: branches/R2_14/Src/HexMergeDoc.cpp =================================================================== --- branches/R2_14/Src/HexMergeDoc.cpp 2010-09-22 19:08:08 UTC (rev 7277) +++ branches/R2_14/Src/HexMergeDoc.cpp 2010-09-24 06:25:00 UTC (rev 7278) @@ -146,6 +146,8 @@ { m_pView[MERGE_VIEW_LEFT] = NULL; m_pView[MERGE_VIEW_RIGHT] = NULL; + m_nBufferType[0] = BUFFER_NORMAL; + m_nBufferType[1] = BUFFER_NORMAL; } /** @@ -412,30 +414,48 @@ } /** +* @brief Load one file +*/ +HRESULT CHexMergeDoc::LoadOneFile(int index, LPCTSTR filename, BOOL readOnly) +{ + if (Try(m_pView[index]->LoadFile(filename), MB_ICONSTOP) != 0) + return E_FAIL; + m_pView[index]->SetReadOnly(readOnly); + m_filePaths.SetPath(index, filename); + ASSERT(m_nBufferType[index] == BUFFER_NORMAL); // should have been initialized to BUFFER_NORMAL in constructor + String strDesc = GetMainFrame()->m_strDescriptions[index]; + if (!strDesc.empty()) + { + m_strDesc[index] = strDesc; + m_nBufferType[index] = BUFFER_NORMAL_NAMED; + } + UpdateHeaderPath(index); + m_pView[index]->ResizeWindow(); + return S_OK; +} + +/** * @brief Load files and initialize frame's compare result icon */ HRESULT CHexMergeDoc::OpenDocs(LPCTSTR pathLeft, LPCTSTR pathRight, BOOL bROLeft, BOOL bRORight) { - if (Try(m_pView[MERGE_VIEW_LEFT]->LoadFile(pathLeft), MB_ICONSTOP) == 0) + CHexMergeFrame *pf = GetParentFrame(); + ASSERT(pf); + HRESULT hr; + if (SUCCEEDED(hr = LoadOneFile(MERGE_VIEW_LEFT, pathLeft, bROLeft)) && + SUCCEEDED(hr = LoadOneFile(MERGE_VIEW_RIGHT, pathRight, bRORight))) { - m_pView[MERGE_VIEW_LEFT]->SetReadOnly(bROLeft); - m_filePaths.SetLeft(pathLeft); - m_strDesc[MERGE_VIEW_LEFT] = pathLeft; - UpdateHeaderPath(MERGE_VIEW_LEFT); + UpdateDiffItem(0); + pf->Invalidate(); + if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST)) + m_pView[MERGE_VIEW_LEFT]->SendMessage(WM_COMMAND, ID_FIRSTDIFF); } - if (Try(m_pView[MERGE_VIEW_RIGHT]->LoadFile(pathRight), MB_ICONSTOP) == 0) + else { - m_pView[MERGE_VIEW_RIGHT]->SetReadOnly(bRORight); - m_filePaths.SetRight(pathRight); - m_strDesc[MERGE_VIEW_RIGHT] = pathRight; - UpdateHeaderPath(MERGE_VIEW_RIGHT); + // Use verify macro to trap possible error in debug. + VERIFY(pf->DestroyWindow()); } - m_pView[MERGE_VIEW_LEFT]->ResizeWindow(); - m_pView[MERGE_VIEW_RIGHT]->ResizeWindow(); - UpdateDiffItem(0); - if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST)) - m_pView[MERGE_VIEW_LEFT]->SendMessage(WM_COMMAND, ID_FIRSTDIFF); - return S_OK; + return hr; } /** Modified: branches/R2_14/Src/HexMergeDoc.h =================================================================== --- branches/R2_14/Src/HexMergeDoc.h 2010-09-22 19:08:08 UTC (rev 7277) +++ branches/R2_14/Src/HexMergeDoc.h 2010-09-24 06:25:00 UTC (rev 7278) @@ -25,7 +25,6 @@ // RCS ID line follows -- this is updated by CVS // $Id$ -#include "TempFile.h" #include "PathContext.h" #include "DiffFileInfo.h" @@ -72,14 +71,14 @@ CHexMergeFrame * GetParentFrame(); void UpdateHeaderPath(int pane); HRESULT OpenDocs(LPCTSTR pathLeft, LPCTSTR pathRight, BOOL bROLeft, BOOL bRORight); -protected: +private: static void CopySel(CHexMergeView *pViewSrc, CHexMergeView *pViewDst); static void CopyAll(CHexMergeView *pViewSrc, CHexMergeView *pViewDst); + HRESULT LoadOneFile(int index, LPCTSTR filename, BOOL readOnly); // Implementation data protected: CHexMergeView * m_pView[MERGE_VIEW_COUNT]; /**< Pointer to left/right view */ CDirDoc * m_pDirDoc; - TempFile m_tempFiles[2]; /**< Temp files for compared files */ String m_strDesc[2]; /**< Left/right side description text */ BUFFERTYPE m_nBufferType[2]; Modified: branches/R2_14/Src/HexMergeFrm.cpp =================================================================== --- branches/R2_14/Src/HexMergeFrm.cpp 2010-09-22 19:08:08 UTC (rev 7277) +++ branches/R2_14/Src/HexMergeFrm.cpp 2010-09-24 06:25:00 UTC (rev 7278) @@ -41,11 +41,6 @@ static char THIS_FILE[] = __FILE__; #endif -/** - * @brief RO status panel width - */ -static UINT RO_PANEL_WIDTH = 40; - ///////////////////////////////////////////////////////////////////////////// // CHexMergeFrame @@ -78,19 +73,6 @@ PANE_RIGHT_EOL, }; -/** - * @brief Bottom statusbar panels and indicators - */ -static UINT indicatorsBottom[] = -{ - ID_SEPARATOR, - ID_SEPARATOR, - ID_SEPARATOR, - ID_SEPARATOR, - ID_SEPARATOR, - ID_SEPARATOR, -}; - ///////////////////////////////////////////////////////////////////////////// // CHexMergeFrame construction/destruction @@ -98,7 +80,6 @@ : m_hIdentical(NULL) , m_hDifferent(NULL) { - m_bActivated = FALSE; m_nLastSplitPos = 0; m_pMergeDoc = 0; } @@ -145,13 +126,15 @@ /** * @brief Create a status bar to be associated with a heksedit control */ -void CHexMergeFrame::CreateHexWndStatusBar(CStatusBar &wndStatusBar) +void CHexMergeFrame::CreateHexWndStatusBar(CStatusBar &wndStatusBar, CWnd *pwndPane) { - wndStatusBar.Create(this, WS_CHILD|WS_VISIBLE); + wndStatusBar.Create(pwndPane, WS_CHILD|WS_VISIBLE); wndStatusBar.SetIndicators(0, 3); wndStatusBar.SetPaneInfo(0, 0, SBPS_STRETCH, 0); - wndStatusBar.SetPaneInfo(1, 0, 0, 72); - wndStatusBar.SetPaneInfo(2, 0, 0, 72); + wndStatusBar.SetPaneInfo(1, 0, 0, 80); + wndStatusBar.SetPaneInfo(2, 0, 0, 80); + wndStatusBar.SetParent(this); + wndStatusBar.SetWindowPos(&wndBottom, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); } /** @@ -194,35 +177,31 @@ m_wndFilePathBar.SetActive(0, FALSE); m_wndFilePathBar.SetActive(1, FALSE); + CHexMergeView *pLeft = static_cast<CHexMergeView *>(m_wndSplitter.GetPane(0, 0)); + CHexMergeView *pRight = static_cast<CHexMergeView *>(m_wndSplitter.GetPane(0, 1)); + m_wndLeftStatusBar.m_cxRightBorder = 4; - ModifyStyle(WS_THICKFRAME, 0); // Prevent SBARS_SIZEGRIP - CreateHexWndStatusBar(m_wndLeftStatusBar); - ModifyStyle(0, WS_THICKFRAME); - CreateHexWndStatusBar(m_wndRightStatusBar); + CreateHexWndStatusBar(m_wndLeftStatusBar, pLeft); + pRight->ModifyStyle(0, WS_THICKFRAME); // Create an SBARS_SIZEGRIP + CreateHexWndStatusBar(m_wndRightStatusBar, pRight); + pRight->ModifyStyle(WS_THICKFRAME, 0); CSize size = m_wndLeftStatusBar.CalcFixedLayout(TRUE, TRUE); m_rectBorder.bottom = size.cy; - m_hIdentical = AfxGetApp()->LoadIcon(IDI_EQUALFILE); - m_hDifferent = AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE); + m_hIdentical = AfxGetApp()->LoadIcon(IDI_EQUALBINARY); + m_hDifferent = AfxGetApp()->LoadIcon(IDI_BINARYDIFF); - // stash left & right pointers into the mergedoc - CHexMergeView *pLeft = static_cast<CHexMergeView *>(m_wndSplitter.GetPane(0,0)); - CHexMergeView *pRight = static_cast<CHexMergeView *>(m_wndSplitter.GetPane(0,1)); + // get the IHexEditorWindow interfaces + IHexEditorWindow *pifLeft = pLeft->GetInterface(); + IHexEditorWindow *pifRight = pRight->GetInterface(); - IHexEditorWindow *pifLeft = reinterpret_cast<IHexEditorWindow *>( - ::GetWindowLongPtr(pLeft->m_hWnd, GWLP_USERDATA)); - IHexEditorWindow *pifRight = reinterpret_cast<IHexEditorWindow *>( - ::GetWindowLongPtr(pRight->m_hWnd, GWLP_USERDATA)); + // tell the heksedit controls about each other + pifLeft->set_sibling(pifRight); + pifRight->set_sibling(pifLeft); - if (pifLeft && pifRight) - { - pifLeft->set_sibling(pifRight); - pifRight->set_sibling(pifLeft); - pifLeft->set_status_bar(m_wndLeftStatusBar.m_hWnd); - pifRight->set_status_bar(m_wndRightStatusBar.m_hWnd); - Customize(pifLeft); - Customize(pifRight); - } + // adjust a few settings and colors + Customize(pifLeft); + Customize(pifRight); // tell merge doc about these views m_pMergeDoc = dynamic_cast<CHexMergeDoc *>(pContext->m_pCurrentDoc); @@ -250,6 +229,15 @@ } } +void CHexMergeFrame::ActivateFrame(int nCmdShow) +{ + if (!GetMDIFrame()->MDIGetActive() && theApp.GetProfileInt(_T("Settings"), _T("ActiveFrameMax"), FALSE)) + { + nCmdShow = SW_SHOWMAXIMIZED; + } + CMDIChildWnd::ActivateFrame(nCmdShow); +} + /** * @brief Save the window's position, free related resources, and destroy the window */ Modified: branches/R2_14/Src/HexMergeFrm.h =================================================================== --- branches/R2_14/Src/HexMergeFrm.h 2010-09-22 19:08:08 UTC (rev 7277) +++ branches/R2_14/Src/HexMergeFrm.h 2010-09-24 06:25:00 UTC (rev 7278) @@ -28,8 +28,10 @@ #include "SplitterWndEx.h" #include "EditorFilepathBar.h" -#include "../externals/heksedit/heksedit.h" +#define HEKSEDIT_INTERFACE_VERSION 1 +#include "heksedit.h" + class CHexMergeDoc; /** @@ -67,6 +69,7 @@ //{{AFX_VIRTUAL(CHexMergeFrame) public: virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext); + virtual void ActivateFrame(int nCmdShow = -1); virtual BOOL DestroyWindow(); protected: //}}AFX_VIRTUAL @@ -75,12 +78,11 @@ private: void SavePosition(); virtual ~CHexMergeFrame(); - void CreateHexWndStatusBar(CStatusBar &); + void CreateHexWndStatusBar(CStatusBar &, CWnd *); // Generated message map functions private: int m_nLastSplitPos; void UpdateHeaderSizes(); - BOOL m_bActivated; CHexMergeDoc * m_pMergeDoc; HICON m_hIdentical; HICON m_hDifferent; Modified: branches/R2_14/Src/HexMergeView.cpp =================================================================== --- branches/R2_14/Src/HexMergeView.cpp 2010-09-22 19:08:08 UTC (rev 7277) +++ branches/R2_14/Src/HexMergeView.cpp 2010-09-24 06:25:00 UTC (rev 7278) @@ -34,7 +34,6 @@ #include "HexMergeView.h" #include "OptionsDef.h" #include "Environment.h" -#include "../externals/heksedit/version.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -122,14 +121,14 @@ */ BOOL CHexMergeView::PreCreateWindow(CREATESTRUCT& cs) { - static const TCHAR pe[] = PE_HEKSEDIT; - static const TCHAR wc[] = WC_HEKSEDIT; - if ((cs.hInstance = ::GetModuleHandle(pe)) == 0 && - (cs.hInstance = ::LoadLibrary(pe)) == 0) + static void *pv = NULL; + if (pv == NULL) { - return FALSE; + static const CLSID clsid = { 0xBCA3CA6B, 0xCC6B, 0x4F79, + { 0xA2, 0xC2, 0xDD, 0xBE, 0x86, 0x4B, 0x1C, 0x90 } }; + CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, IID_IUnknown, &pv); } - cs.lpszClass = wc; + cs.lpszClass = _T("heksedit"); cs.style |= WS_HSCROLL | WS_VSCROLL; return TRUE; } @@ -142,7 +141,7 @@ if (CView::OnCreate(lpCreateStruct) == -1) return -1; m_pif = reinterpret_cast<IHexEditorWindow *>(::GetWindowLongPtr(m_hWnd, GWLP_USERDATA)); - if (m_pif == 0) + if (m_pif == 0 || m_pif->get_interface_version() < HEKSEDIT_INTERFACE_VERSION) return -1; return 0; } @@ -276,7 +275,7 @@ if (hr != S_OK) GetBuffer(0); } - else + else if (length != 0) { hr = E_OUTOFMEMORY; } @@ -336,7 +335,7 @@ if (hr != S_OK) { LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"), - sIntermediateFilename.c_str(), GetSysError(hr))); + sIntermediateFilename.c_str(), GetSysError(hr).c_str())); } return S_OK; } Modified: branches/R2_14/Src/HexMergeView.h =================================================================== --- branches/R2_14/Src/HexMergeView.h 2010-09-22 19:08:08 UTC (rev 7277) +++ branches/R2_14/Src/HexMergeView.h 2010-09-24 06:25:00 UTC (rev 7278) @@ -47,6 +47,7 @@ public: HRESULT LoadFile(LPCTSTR); HRESULT SaveFile(LPCTSTR); + IHexEditorWindow *GetInterface() const { return m_pif; } IHexEditorWindow::Status *GetStatus(); BYTE *GetBuffer(int); int GetLength(); Added: branches/R2_14/Src/heksedit.h =================================================================== --- branches/R2_14/Src/heksedit.h (rev 0) +++ branches/R2_14/Src/heksedit.h 2010-09-24 06:25:00 UTC (rev 7278) @@ -0,0 +1,115 @@ +///////////////////////////////////////////////////////////////////////////// +// 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 heksedit.h + * + * @brief Interface definition for the hekseditor window. + * + */ +// ID line follows -- this is updated by SVN +// $Id: heksedit.h 492 2009-04-11 15:17:02Z jtuc $ + +#ifndef _HEKSEDIT_H_ +#define _HEKSEDIT_H_ + +#ifndef HEKSEDIT_INTERFACE_VERSION +#define HEKSEDIT_INTERFACE_VERSION 1 +#endif + +/** + * @brief Interface for the Hexeditor window. + * @note This file is published to hosting applications. Do not add global declarations. + */ +class IHexEditorWindow +{ +public: + /** + * @brief Byte endians. + */ + enum BYTE_ENDIAN + { + ENDIAN_LITTLE, /**< Little endian used e.g. in Intel processors. */ + ENDIAN_BIG /**< Big endian used e.g. in Motorola processors. */ + }; + + struct Colors + { + COLORREF iTextColorValue, iBkColorValue, iSepColorValue; + COLORREF iSelBkColorValue, iSelTextColorValue; + COLORREF iBmkColor; + COLORREF iDiffBkColorValue, iDiffTextColorValue, iSelDiffBkColorValue, iSelDiffTextColorValue; + }; + + struct Settings + { + int iBytesPerLine; + int iAutomaticBPL; + BYTE_ENDIAN iBinaryMode; + int bReadOnly; + int bSaveIni; + int iFontSize; + int iCharacterSet; + int iMinOffsetLen; + int iMaxOffsetLen; + int bAutoOffsetLen; + int bCenterCaret; + int iFontZoom; + }; + + struct Status + { + int iFileChanged; + int iEnteringMode; + int iCurByte; + int iCurNibble; + int iVscrollMax; + int iVscrollPos; + int iHscrollMax; + int iHscrollPos; + int bSelected; + int iStartOfSelection; + int iEndOfSelection; + }; + + virtual unsigned STDMETHODCALLTYPE get_interface_version() = 0; + virtual unsigned char *STDMETHODCALLTYPE get_buffer(int) = 0; + virtual int STDMETHODCALLTYPE get_length() = 0; + virtual void STDMETHODCALLTYPE set_sibling(IHexEditorWindow *) = 0; + virtual Colors *STDMETHODCALLTYPE get_colors() = 0; + virtual Settings *STDMETHODCALLTYPE get_settings() = 0; + virtual Status *STDMETHODCALLTYPE get_status() = 0; + virtual void STDMETHODCALLTYPE resize_window() = 0; + virtual void STDMETHODCALLTYPE repaint(int from, int to) = 0; + virtual void STDMETHODCALLTYPE adjust_hscrollbar() = 0; + virtual void STDMETHODCALLTYPE adjust_vscrollbar() = 0; + virtual int STDMETHODCALLTYPE translate_accelerator(MSG *) = 0; + virtual void STDMETHODCALLTYPE CMD_find() = 0; + virtual void STDMETHODCALLTYPE CMD_findprev() = 0; + virtual void STDMETHODCALLTYPE CMD_findnext() = 0; + virtual void STDMETHODCALLTYPE CMD_replace() = 0; + virtual void STDMETHODCALLTYPE CMD_edit_cut() = 0; + virtual void STDMETHODCALLTYPE CMD_edit_copy() = 0; + virtual void STDMETHODCALLTYPE CMD_edit_paste() = 0; + virtual void STDMETHODCALLTYPE CMD_edit_clear() = 0; + virtual BOOL STDMETHODCALLTYPE select_next_diff(BOOL bFromStart) = 0; + virtual BOOL STDMETHODCALLTYPE select_prev_diff(BOOL bFromEnd) = 0; + virtual BOOL STDMETHODCALLTYPE load_lang(LANGID langid, LPCWSTR langdir = NULL) = 0; + virtual void STDMETHODCALLTYPE CMD_zoom(int) = 0; + virtual void STDMETHODCALLTYPE CMD_select_all() = 0; +}; + +#endif // _HEKSEDIT_H_ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-17 12:15:34
|
Revision: 7309 http://winmerge.svn.sourceforge.net/winmerge/?rev=7309&view=rev Author: gerundt Date: 2010-10-17 12:15:28 +0000 (Sun, 17 Oct 2010) Log Message: ----------- Fixing 64-bit build warnings in R2_14 Modified Paths: -------------- branches/R2_14/Src/ChildFrm.cpp branches/R2_14/Src/Common/CMoveConstraint.cpp branches/R2_14/Src/Common/CMoveConstraint.h branches/R2_14/Src/Common/MessageBoxDialog.h branches/R2_14/Src/Common/PropertyPageHost.cpp branches/R2_14/Src/Common/PropertyPageHost.h branches/R2_14/Src/Merge.cpp branches/R2_14/Src/MovedBlocks.cpp Modified: branches/R2_14/Src/ChildFrm.cpp =================================================================== --- branches/R2_14/Src/ChildFrm.cpp 2010-10-16 19:08:36 UTC (rev 7308) +++ branches/R2_14/Src/ChildFrm.cpp 2010-10-17 12:15:28 UTC (rev 7309) @@ -326,7 +326,7 @@ */ BOOL CChildFrame::EnsureValidDockState(CDockState& state) { - for (int i = state.m_arrBarInfo.GetSize()-1 ; i >= 0; i--) + for (int i = (int) state.m_arrBarInfo.GetSize()-1 ; i >= 0; i--) { BOOL barIsCorrect = TRUE; CControlBarInfo* pInfo = (CControlBarInfo*)state.m_arrBarInfo[i]; Modified: branches/R2_14/Src/Common/CMoveConstraint.cpp =================================================================== --- branches/R2_14/Src/Common/CMoveConstraint.cpp 2010-10-16 19:08:36 UTC (rev 7308) +++ branches/R2_14/Src/Common/CMoveConstraint.cpp 2010-10-17 12:15:28 UTC (rev 7309) @@ -626,7 +626,7 @@ bool CMoveConstraint::OnTtnNeedText(TOOLTIPTEXT * pTTT, LRESULT * plresult) { - UINT id = pTTT->hdr.idFrom; + UINT_PTR id = pTTT->hdr.idFrom; UINT uflags = pTTT->uFlags; if (uflags & TTF_IDISHWND) id = GetDlgCtrlID((HWND)id); Modified: branches/R2_14/Src/Common/CMoveConstraint.h =================================================================== --- branches/R2_14/Src/Common/CMoveConstraint.h 2010-10-16 19:08:36 UTC (rev 7308) +++ branches/R2_14/Src/Common/CMoveConstraint.h 2010-10-17 12:15:28 UTC (rev 7309) @@ -249,7 +249,7 @@ CString m_sRegistrySubkey; // defaults to _T("LastWindowPos") CString m_sRegistryValueName; // should be name of window // tooltips - CMap<UINT, UINT, tip, tip&> m_tips; + CMap<UINT_PTR, UINT_PTR, tip, tip&> m_tips; }; } // namespace Modified: branches/R2_14/Src/Common/MessageBoxDialog.h =================================================================== --- branches/R2_14/Src/Common/MessageBoxDialog.h 2010-10-16 19:08:36 UTC (rev 7308) +++ branches/R2_14/Src/Common/MessageBoxDialog.h 2010-10-17 12:15:28 UTC (rev 7309) @@ -204,7 +204,7 @@ UINT m_nTimeoutSeconds; // Seconds for a timeout. BOOL m_bTimeoutDisabled; // Flag whether the timeout is disabled. - UINT m_nTimeoutTimer; // Timer for the timeout. + UINT_PTR m_nTimeoutTimer; // Timer for the timeout. CString m_strRegistryKey; // Entry for storing the result in the // registry, if the MB_DONT_DISPLAY_AGAIN Modified: branches/R2_14/Src/Common/PropertyPageHost.cpp =================================================================== --- branches/R2_14/Src/Common/PropertyPageHost.cpp 2010-10-16 19:08:36 UTC (rev 7308) +++ branches/R2_14/Src/Common/PropertyPageHost.cpp 2010-10-17 12:15:28 UTC (rev 7309) @@ -200,7 +200,7 @@ if (FindPage(pPage) == -1) { PAGEITEM pi(pPage, szTitle, dwItemData); - int nPage = m_aPages.Add(pi); + int nPage = (int) m_aPages.Add(pi); if (szTitle) { @@ -214,7 +214,7 @@ int CPropertyPageHost::FindPage(CPropertyPage* pPage) { - int nPage = m_aPages.GetSize(); + int nPage = (int) m_aPages.GetSize(); while (nPage--) { @@ -310,7 +310,7 @@ void CPropertyPageHost::OnOK() { - int nPage = m_aPages.GetSize(); + int nPage = (int) m_aPages.GetSize(); while (nPage--) { @@ -329,7 +329,7 @@ */ void CPropertyPageHost::UpdatePagesData() { - int nPage = m_aPages.GetSize(); + int nPage = (int) m_aPages.GetSize(); while (nPage--) { @@ -384,7 +384,7 @@ CPropertyPage* CPropertyPageHost::FindPage(DWORD dwItemData) { - int nPage = m_aPages.GetSize(); + int nPage = (int) m_aPages.GetSize(); while (nPage--) { Modified: branches/R2_14/Src/Common/PropertyPageHost.h =================================================================== --- branches/R2_14/Src/Common/PropertyPageHost.h 2010-10-16 19:08:36 UTC (rev 7308) +++ branches/R2_14/Src/Common/PropertyPageHost.h 2010-10-17 12:15:28 UTC (rev 7309) @@ -48,7 +48,7 @@ BOOL AddPage(CPropertyPage* pPage, LPCTSTR szTitle = NULL, DWORD dwItemData = 0); BOOL SetActivePage(int nIndex, BOOL bAndFocus = TRUE); BOOL SetActivePage(CPropertyPage* pPage, BOOL bAndFocus = TRUE); - int GetPageCount() { return m_aPages.GetSize(); } + int GetPageCount() { return (int) m_aPages.GetSize(); } CString GetPageTitle(int nIndex); DWORD GetPageItemData(int nIndex); CPropertyPage* GetPage(int nIndex); Modified: branches/R2_14/Src/Merge.cpp =================================================================== --- branches/R2_14/Src/Merge.cpp 2010-10-16 19:08:36 UTC (rev 7308) +++ branches/R2_14/Src/Merge.cpp 2010-10-17 12:15:28 UTC (rev 7309) @@ -504,7 +504,7 @@ nIDPrompt); // Display the message box dialog and return the result. - return dlgMessage.DoModal(); + return (int) dlgMessage.DoModal(); } /** Modified: branches/R2_14/Src/MovedBlocks.cpp =================================================================== --- branches/R2_14/Src/MovedBlocks.cpp 2010-10-16 19:08:36 UTC (rev 7308) +++ branches/R2_14/Src/MovedBlocks.cpp 2010-10-17 12:15:28 UTC (rev 7309) @@ -31,7 +31,7 @@ public: void Add(int val) { m_map.SetAt(val, 1); } void Remove(int val) { m_map.RemoveKey(val); } - int count() const { return m_map.GetCount(); } + int count() const { return (int) m_map.GetCount(); } bool isPresent(int val) const { int parm; return !!m_map.Lookup(val, parm); } int getSingle() const { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-18 13:52:08
|
Revision: 7315 http://winmerge.svn.sourceforge.net/winmerge/?rev=7315&view=rev Author: gerundt Date: 2010-10-18 13:52:00 +0000 (Mon, 18 Oct 2010) Log Message: ----------- Fix whitespace in DirView.[cpp|h] from R2_14 Modified Paths: -------------- branches/R2_14/Src/DirView.cpp branches/R2_14/Src/DirView.h Modified: branches/R2_14/Src/DirView.cpp =================================================================== --- branches/R2_14/Src/DirView.cpp 2010-10-18 09:16:32 UTC (rev 7314) +++ branches/R2_14/Src/DirView.cpp 2010-10-18 13:52:00 UTC (rev 7315) @@ -108,21 +108,21 @@ ///////////////////////////////////////////////////////////////////////////// // CDirView -enum { COLUMN_REORDER=99 }; +enum { COLUMN_REORDER = 99 }; IMPLEMENT_DYNCREATE(CDirView, CListView) CDirView::CDirView() -: m_numcols(-1) -, m_dispcols(-1) -, m_pList(NULL) -, m_nHiddenItems(0) -, m_pCmpProgressDlg(NULL) -, m_compareStart(0) -, m_bTreeMode(false) -, m_pShellContextMenuLeft(NULL) -, m_pShellContextMenuRight(NULL) -, m_hCurrentMenu(NULL) + : m_numcols(-1) + , m_dispcols(-1) + , m_pList(NULL) + , m_nHiddenItems(0) + , m_pCmpProgressDlg(NULL) + , m_compareStart(0) + , m_bTreeMode(false) + , m_pShellContextMenuLeft(NULL) + , m_pShellContextMenuRight(NULL) + , m_hCurrentMenu(NULL) { m_dwDefaultStyle &= ~LVS_TYPEMASK; // Show selection all the time, so user can see current item even when @@ -255,7 +255,7 @@ ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged) ON_NOTIFY_REFLECT(LVN_BEGINLABELEDIT, OnBeginLabelEdit) ON_NOTIFY_REFLECT(LVN_ENDLABELEDIT, OnEndLabelEdit) - ON_NOTIFY_REFLECT(NM_CLICK, OnClick) + ON_NOTIFY_REFLECT(NM_CLICK, OnClick) END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// @@ -273,7 +273,7 @@ ///////////////////////////////////////////////////////////////////////////// // CDirView message handlers -void CDirView::OnInitialUpdate() +void CDirView::OnInitialUpdate() { const int iconCX = 16; const int iconCY = 16; @@ -295,7 +295,7 @@ // Load the icons used for the list view (to reflect diff status) // NOTE: these must be in the exactly the same order than in enum // definition in begin of this file! - VERIFY (m_imageList.Create (iconCX, iconCY, ILC_COLOR32 | ILC_MASK, 15, 1)); + VERIFY (m_imageList.Create(iconCX, iconCY, ILC_COLOR32 | ILC_MASK, 15, 1)); VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_LFILE))); VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_RFILE))); VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE))); @@ -315,7 +315,7 @@ VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_COMPARE_ABORTED))); VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALTEXTFILE))); VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_EQUALTEXTFILE))); - m_pList->SetImageList (&m_imageList, LVSIL_SMALL); + m_pList->SetImageList(&m_imageList, LVSIL_SMALL); // Load the icons used for the list view (expanded/collapsed state icons) VERIFY(m_imageState.Create(IDB_TREE_STATE, 16, 1, RGB(255, 0, 255))); @@ -420,7 +420,7 @@ * @brief Called when folder compare row is double-clicked with mouse. * Selected item is opened to folder or file compare. */ -void CDirView::OnLButtonDblClk(UINT nFlags, CPoint point) +void CDirView::OnLButtonDblClk(UINT nFlags, CPoint point) { LVHITTESTINFO lvhti; lvhti.pt = point; @@ -458,9 +458,9 @@ /** * @brief Redisplay items in subfolder - * @param [in] diffpos First item position in subfolder. + * @param [in] diffpos First item position in subfolder. * @param [in] level Indent level - * @param [in,out] index Index of the item to be inserted. + * @param [in,out] index Index of the item to be inserted. * @param [in,out] alldiffs Number of different items */ void CDirView::RedisplayChildren(UINT_PTR diffpos, int level, UINT &index, int &alldiffs) @@ -526,7 +526,7 @@ // If non-recursive compare, add special item(s) String leftParent, rightParent; if (!pDoc->GetRecursive() || - pDoc->AllowUpwardDirectory(leftParent, rightParent) == CDirDoc::AllowUpwardDirectory::ParentIsTempPath) + pDoc->AllowUpwardDirectory(leftParent, rightParent) == CDirDoc::AllowUpwardDirectory::ParentIsTempPath) { cnt += AddSpecialItems(); } @@ -550,7 +550,7 @@ // Make sure window is active GetParentFrame()->ActivateFrame(); - int i=0; + int i = 0; if (point.x == -1 && point.y == -1) { //keystroke invocation @@ -560,7 +560,9 @@ point = rect.TopLeft(); point.Offset(5, 5); - } else { + } + else + { // Check if user right-clicked on header // convert screen coordinates to client coordinates of listview CPoint insidePt = point; @@ -570,7 +572,7 @@ HDHITTESTINFO hhti; memset(&hhti, 0, sizeof(hhti)); hhti.pt = insidePt; - int col = GetListCtrl().GetHeaderCtrl()->SendMessage(HDM_HITTEST, 0, (LPARAM)&hhti); + int col = GetListCtrl().GetHeaderCtrl()->SendMessage(HDM_HITTEST, 0, (LPARAM) & hhti); if (col >= 0) { // Presumably hhti.flags & HHT_ONHEADER is true @@ -585,7 +587,7 @@ lhti.pt = insidePt; i = GetListCtrl().HitTest(insidePt); TRACE(_T("i=%d\n"), i); - if (i<0) + if (i < 0) return; } @@ -729,8 +731,8 @@ // note the prediffer flag for 'files present on both sides and not skipped' if (!di.diffcode.isDirectory() && !di.diffcode.isBin() && - !di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly() && - !di.diffcode.isResultFiltered()) + !di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly() && + !di.diffcode.isResultFiltered()) { String leftPath = di.getLeftFilepath(pDoc->GetLeftBasePath()) + _T("\\") + di.left.filename; @@ -766,14 +768,14 @@ // invoke context menu // this will invoke all the OnUpdate methods to enable/disable the individual items BOOL nCmd = pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, point.x, point.y, - AfxGetMainWnd()); + AfxGetMainWnd()); if (nCmd) { HWND hWnd = AfxGetMainWnd()->GetSafeHwnd(); - ( m_pShellContextMenuLeft && m_pShellContextMenuLeft->InvokeCommand(nCmd, hWnd) ) - || ( m_pShellContextMenuRight && m_pShellContextMenuRight->InvokeCommand(nCmd, hWnd) ) - // we have called TrackPopupMenu with TPM_RETURNCMD flag so we have to post message ourselves - || PostMessage(WM_COMMAND, MAKEWPARAM(nCmd, 0), 0); + (m_pShellContextMenuLeft && m_pShellContextMenuLeft->InvokeCommand(nCmd, hWnd)) + || (m_pShellContextMenuRight && m_pShellContextMenuRight->InvokeCommand(nCmd, hWnd)) + // we have called TrackPopupMenu with TPM_RETURNCMD flag so we have to post message ourselves + || PostMessage(WM_COMMAND, MAKEWPARAM(nCmd, 0), 0); } pFrame->m_bAutoMenuEnable = TRUE; } @@ -794,8 +796,8 @@ // invoke context menu // this will invoke all the OnUpdate methods to enable/disable the individual items pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y, - AfxGetMainWnd()); -} + AfxGetMainWnd()); +} /** * @brief Gets Explorer's context menu for a group of selected files. @@ -821,8 +823,8 @@ continue; String currentDir = (side == SIDE_LEFT) ? - di.getLeftFilepath(pDoc->GetLeftBasePath()) : - di.getRightFilepath(pDoc->GetRightBasePath()); + di.getLeftFilepath(pDoc->GetLeftBasePath()) : + di.getRightFilepath(pDoc->GetRightBasePath()); String filename = ((side == SIDE_LEFT) ? di.left.filename : di.right.filename); @@ -847,7 +849,7 @@ { CString s; LangFormatString1(s, nStringResource, szPath); - pPopup->ModifyMenu(nMenuId, MF_BYCOMMAND|MF_STRING, nMenuId, s); + pPopup->ModifyMenu(nMenuId, MF_BYCOMMAND | MF_STRING, nMenuId, s); } @@ -890,23 +892,23 @@ } /// Update context menu Copy Right to Left item -void CDirView::OnUpdateCtxtDirCopyRightToLeft(CCmdUI* pCmdUI) +void CDirView::OnUpdateCtxtDirCopyRightToLeft(CCmdUI* pCmdUI) { DoUpdateDirCopyRightToLeft(pCmdUI, eContext); } /// Update context menu Copy Left to Right item -void CDirView::OnUpdateCtxtDirCopyLeftToRight(CCmdUI* pCmdUI) +void CDirView::OnUpdateCtxtDirCopyLeftToRight(CCmdUI* pCmdUI) { DoUpdateDirCopyLeftToRight(pCmdUI, eContext); } /// Update main menu Copy Right to Left item -void CDirView::OnUpdateDirCopyRightToLeft(CCmdUI* pCmdUI) +void CDirView::OnUpdateDirCopyRightToLeft(CCmdUI* pCmdUI) { DoUpdateDirCopyRightToLeft(pCmdUI, eMain); } /// Update main menu Copy Left to Right item -void CDirView::OnUpdateDirCopyLeftToRight(CCmdUI* pCmdUI) +void CDirView::OnUpdateDirCopyLeftToRight(CCmdUI* pCmdUI) { DoUpdateDirCopyLeftToRight(pCmdUI, eMain); } @@ -918,8 +920,8 @@ pCmdUI->Enable(FALSE); else { - int sel=-1; - int legalcount=0, selcount=0; + int sel = -1; + int legalcount = 0, selcount = 0; while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1) { const DIFFITEM& di = GetDiffItem(sel); @@ -927,8 +929,8 @@ ++legalcount; ++selcount; } - pCmdUI->Enable(legalcount>0); - if (menuType==eContext) + pCmdUI->Enable(legalcount > 0); + if (menuType == eContext) { CString s; if (legalcount == selcount) @@ -947,8 +949,8 @@ pCmdUI->Enable(FALSE); else { - int sel=-1; - int legalcount=0, selcount=0; + int sel = -1; + int legalcount = 0, selcount = 0; while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1) { const DIFFITEM& di = GetDiffItem(sel); @@ -956,8 +958,8 @@ ++legalcount; ++selcount; } - pCmdUI->Enable(legalcount>0); - if (menuType==eContext) + pCmdUI->Enable(legalcount > 0); + if (menuType == eContext) { CString s; if (legalcount == selcount) @@ -1019,7 +1021,7 @@ } /// Do any last minute work as view closes -void CDirView::OnDestroy() +void CDirView::OnDestroy() { DeleteAllDisplayItems(); @@ -1035,9 +1037,9 @@ /** * @brief Open selected item when user presses ENTER key. */ -void CDirView::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) +void CDirView::OnChar(UINT nChar, UINT nRepCnt, UINT nFlags) { - if(nChar==VK_RETURN) + if (nChar == VK_RETURN) { int sel = GetFocusedItem(); if (sel >= 0) @@ -1063,7 +1065,7 @@ /** * @brief Expand/collapse subfolder when user presses right/left arrow key. */ -void CDirView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) +void CDirView::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags) { int sel = GetFocusedItem(); switch (nChar) @@ -1168,7 +1170,7 @@ // fall through (no break!) case CDirDoc::AllowUpwardDirectory::ParentIsRegularPath: GetMainFrame()->DoFileOpen(leftParent.c_str(), rightParent.c_str(), - FFILEOPEN_NOMRU, FFILEOPEN_NOMRU, pDoc->GetRecursive(), pDoc); + FFILEOPEN_NOMRU, FFILEOPEN_NOMRU, pDoc->GetRecursive(), pDoc); // fall through (no break!) case CDirDoc::AllowUpwardDirectory::No: break; @@ -1193,7 +1195,7 @@ if (*sel2 == -1) return true; int extra = m_pList->GetNextItem(*sel2, LVNI_SELECTED); - return (extra ==-1); + return (extra == -1); } /** @@ -1220,7 +1222,7 @@ { // Browse to parent folder(s) selected // SPECIAL_ITEM_POS is position for - // special items, but there is currenly + // special items, but there is currenly // only one (parent folder) OpenParentDirectory(); } @@ -1374,7 +1376,7 @@ } // Ensure that di1 is on left (swap if needed) if ((*di1)->diffcode.isSideRightOnly() || ((*di1)->diffcode.isSideBoth() && - (*di2)->diffcode.isSideLeftOnly())) + (*di2)->diffcode.isSideLeftOnly())) { DIFFITEM * temp = *di1; *di1 = *di2; @@ -1395,7 +1397,7 @@ { LangMessageBox(IDS_INVALID_DIRECTORY, MB_ICONSTOP); return false; - } + } } return true; } @@ -1416,7 +1418,7 @@ // First, figure out what was selected (store into pos1 & pos2) UINT_PTR pos1 = NULL, pos2 = NULL; - int sel1=-1, sel2=-1; + int sel1 = -1, sel2 = -1; if (!GetSelectedItems(&sel1, &sel2)) { // Must have 1 or 2 items selected @@ -1478,7 +1480,7 @@ // Binary attributes are set after files are unpacked // so after plugins such as the MS-Office plugins have had a chance to make them textual - // We haven't done unpacking yet in this diff, but if a binary flag is already set, + // We haven't done unpacking yet in this diff, but if a binary flag is already set, // then it was set in a previous diff after unpacking, so we trust it // Close open documents first (ask to save unsaved data) @@ -1502,7 +1504,7 @@ DWORD rightFlags = bRightRO ? FFILEOPEN_READONLY : 0; GetMainFrame()->ShowMergeDoc(pDoc, filelocLeft, filelocRight, - leftFlags, rightFlags, infoUnpacker); + leftFlags, rightFlags, infoUnpacker); } } @@ -1512,7 +1514,7 @@ // First, figure out what was selected (store into pos1 & pos2) UINT_PTR pos1 = NULL, pos2 = NULL; - int sel1=-1, sel2=-1; + int sel1 = -1, sel2 = -1; if (!GetSelectedItems(&sel1, &sel2)) { // Must have 1 or 2 items selected @@ -1594,12 +1596,12 @@ } /// Enable/disable Delete Right menu choice on context menu -void CDirView::OnUpdateCtxtDirDelRight(CCmdUI* pCmdUI) +void CDirView::OnUpdateCtxtDirDelRight(CCmdUI* pCmdUI) { DoUpdateCtxtDirDelRight(pCmdUI); } /// Enable/disable Delete Both menu choice on context menu -void CDirView::OnUpdateCtxtDirDelBoth(CCmdUI* pCmdUI) +void CDirView::OnUpdateCtxtDirDelBoth(CCmdUI* pCmdUI) { DoUpdateCtxtDirDelBoth(pCmdUI); } @@ -1611,8 +1613,8 @@ pCmdUI->Enable(FALSE); else { - int sel=-1; - int count=0, total=0; + int sel = -1; + int count = 0, total = 0; while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1) { const DIFFITEM& di = GetDiffItem(sel); @@ -1620,7 +1622,7 @@ ++count; ++total; } - pCmdUI->Enable(count>0); + pCmdUI->Enable(count > 0); CString s; if (count == total) @@ -1632,14 +1634,14 @@ } /// Should Delete right be enabled or disabled ? -void CDirView::DoUpdateCtxtDirDelRight(CCmdUI* pCmdUI) +void CDirView::DoUpdateCtxtDirDelRight(CCmdUI* pCmdUI) { if (GetDocument()->GetReadOnly(FALSE)) pCmdUI->Enable(FALSE); else { - int sel=-1; - int count=0, total=0; + int sel = -1; + int count = 0, total = 0; while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1) { const DIFFITEM& di = GetDiffItem(sel); @@ -1647,8 +1649,8 @@ ++count; ++total; } - pCmdUI->Enable(count>0); - + pCmdUI->Enable(count > 0); + CString s; if (count == total) LangFormatString1(s, IDS_DEL_RIGHT_FMT, NumToStr(total).c_str()); @@ -1661,14 +1663,14 @@ /** * @brief Should Delete both be enabled or disabled ? */ -void CDirView::DoUpdateCtxtDirDelBoth(CCmdUI* pCmdUI) +void CDirView::DoUpdateCtxtDirDelBoth(CCmdUI* pCmdUI) { if (GetDocument()->GetReadOnly(TRUE) || GetDocument()->GetReadOnly(FALSE)) pCmdUI->Enable(FALSE); else { - int sel=-1; - int count=0, total=0; + int sel = -1; + int count = 0, total = 0; while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1) { const DIFFITEM& di = GetDiffItem(sel); @@ -1676,7 +1678,7 @@ ++count; ++total; } - pCmdUI->Enable(count>0); + pCmdUI->Enable(count > 0); CString s; if (count == total) @@ -1690,10 +1692,10 @@ /** * @brief Enable/disable "Copy | Left to..." and update item text */ -void CDirView::DoUpdateCtxtDirCopyLeftTo(CCmdUI* pCmdUI) +void CDirView::DoUpdateCtxtDirCopyLeftTo(CCmdUI* pCmdUI) { - int sel=-1; - int count=0, total=0; + int sel = -1; + int count = 0, total = 0; while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1) { const DIFFITEM& di = GetDiffItem(sel); @@ -1701,7 +1703,7 @@ ++count; ++total; } - pCmdUI->Enable(count>0); + pCmdUI->Enable(count > 0); CString s; if (count == total) @@ -1714,10 +1716,10 @@ /** * @brief Enable/disable "Copy | Right to..." and update item text */ -void CDirView::DoUpdateCtxtDirCopyRightTo(CCmdUI* pCmdUI) +void CDirView::DoUpdateCtxtDirCopyRightTo(CCmdUI* pCmdUI) { - int sel=-1; - int count=0, total=0; + int sel = -1; + int count = 0, total = 0; while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1) { const DIFFITEM& di = GetDiffItem(sel); @@ -1725,7 +1727,7 @@ ++count; ++total; } - pCmdUI->Enable(count>0); + pCmdUI->Enable(count > 0); CString s; if (count == total) @@ -1738,10 +1740,10 @@ /** * @brief Enable/disable "Move | Left to..." and update item text */ -void CDirView::DoUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI) +void CDirView::DoUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI) { - int sel=-1; - int count=0, total=0; + int sel = -1; + int count = 0, total = 0; while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1) { const DIFFITEM& di = GetDiffItem(sel); @@ -1749,7 +1751,7 @@ ++count; ++total; } - pCmdUI->Enable(count>0); + pCmdUI->Enable(count > 0); CString s; if (count == total) @@ -1762,10 +1764,10 @@ /** * @brief Enable/disable "Move | Right to..." and update item text */ -void CDirView::DoUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI) +void CDirView::DoUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI) { - int sel=-1; - int count=0, total=0; + int sel = -1; + int count = 0, total = 0; while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1) { const DIFFITEM& di = GetDiffItem(sel); @@ -1773,7 +1775,7 @@ ++count; ++total; } - pCmdUI->Enable(count>0); + pCmdUI->Enable(count > 0); CString s; if (count == total) @@ -1830,7 +1832,7 @@ DIFFITEM & CDirView::GetDiffItemRef(int sel) { UINT_PTR diffpos = GetItemKey(sel); - + // If it is special item, return empty DIFFITEM if (diffpos == SPECIAL_ITEM_POS) { @@ -1912,7 +1914,7 @@ // return selected item index, or -1 if none or multiple int CDirView::GetSingleSelectedItem() const { - int sel=-1, sel2=-1; + int sel = -1, sel2 = -1; sel = m_pList->GetNextItem(sel, LVNI_SELECTED); if (sel == -1) return -1; sel2 = m_pList->GetNextItem(sel, LVNI_SELECTED); @@ -1944,7 +1946,7 @@ // Used for Open void CDirView::DoUpdateOpen(CCmdUI* pCmdUI) { - int sel1=-1, sel2=-1; + int sel1 = -1, sel2 = -1; if (!GetSelectedItems(&sel1, &sel2)) { // 0 items or more than 2 items seleted @@ -1986,7 +1988,7 @@ sel = -1; } - pCmdUI->Enable(sel>=0); + pCmdUI->Enable(sel >= 0); } // used for OpenRight @@ -2000,7 +2002,7 @@ sel = -1; } - pCmdUI->Enable(sel>=0); + pCmdUI->Enable(sel >= 0); } // used for OpenLeftWith @@ -2014,7 +2016,7 @@ sel = -1; } - pCmdUI->Enable(sel>=0); + pCmdUI->Enable(sel >= 0); } // used for OpenRightWith @@ -2028,7 +2030,7 @@ sel = -1; } - pCmdUI->Enable(sel>=0); + pCmdUI->Enable(sel >= 0); } /** @@ -2059,7 +2061,7 @@ { const DIFFITEM& di = GetDiffItem(sel); if (di.diffcode.diffcode != 0 && - (IsItemDeletableOnLeft(di) || IsItemDeletableOnRight(di))) + (IsItemDeletableOnLeft(di) || IsItemDeletableOnRight(di))) { ++count; } @@ -2072,7 +2074,7 @@ */ void CDirView::DoUpdateCopyFilenames(CCmdUI* pCmdUI) { - int sel =- 1; + int sel = - 1; int count = 0; while ((sel = m_pList->GetNextItem(sel, LVNI_SELECTED)) != -1) { @@ -2111,7 +2113,7 @@ int sel = m_pList->GetNextItem(ind, LVNI_SELECTED); DIFFITEM &di = GetDiffItemRef(ind); ind = sel; - + return di; } @@ -2284,7 +2286,7 @@ { selected = m_pList->GetItemState(i, LVIS_SELECTED); focused = m_pList->GetItemState(i, LVIS_FOCUSED); - + if (selected == LVIS_SELECTED && focused == LVIS_FOCUSED) { m_pList->EnsureVisible(i, FALSE); @@ -2296,7 +2298,7 @@ void CDirView::OnUpdateCurdiff(CCmdUI* pCmdUI) { - int selection = GetFirstSelectedInd(); + int selection = GetFirstSelectedInd(); if (selection > -1) pCmdUI->Enable(TRUE); else @@ -2313,7 +2315,7 @@ while (i < count && found == FALSE) { - focused = m_pList->GetItemState(i, LVIS_FOCUSED); + focused = m_pList->GetItemState(i, LVIS_FOCUSED); if (focused == LVIS_FOCUSED) { retInd = i; @@ -2336,7 +2338,7 @@ const DIFFITEM &di = GetItemAt(i); if (IsItemNavigableDiff(di)) { - foundInd = i; + foundInd = i; found = TRUE; } i++; @@ -2356,7 +2358,7 @@ const DIFFITEM &di = GetItemAt(i); if (IsItemNavigableDiff(di)) { - foundInd = i; + foundInd = i; found = TRUE; } i--; @@ -2382,7 +2384,7 @@ * @brief Move focus to specified item (and selection if multiple items not selected) * * Moves the focus from item [currentInd] to item [i] - * Additionally, if there are not multiple items selected, + * Additionally, if there are not multiple items selected, * deselects item [currentInd] and selects item [i] */ void CDirView::MoveFocus(int currentInd, int i, int selCount) @@ -2517,14 +2519,14 @@ return 0; // return value unused } -BOOL CDirView::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) +BOOL CDirView::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult) { NMHDR * hdr = reinterpret_cast<NMHDR *>(lParam); if (hdr->code == HDN_ENDDRAG) return OnHeaderEndDrag((LPNMHEADER)hdr, pResult); if (hdr->code == HDN_BEGINDRAG) return OnHeaderBeginDrag((LPNMHEADER)hdr, pResult); - + return CListView::OnNotify(wParam, lParam, pResult); } @@ -2566,7 +2568,7 @@ int dest = hdr->pitem->iOrder; BOOL allowDrop = TRUE; *pResult = !allowDrop; - if (allowDrop && src!=dest && dest!=-1) + if (allowDrop && src != dest && dest != -1) { MoveColumn(src, dest); } @@ -2588,7 +2590,7 @@ lvcol.cx = 0; lvcol.pszText = 0; lvcol.iSubItem = 0; - for (int i=0; i<m_numcols; ++i) + for (int i = 0; i < m_numcols; ++i) { lvcol.iOrder = i; GetListCtrl().SetColumn(i, &lvcol); @@ -2604,14 +2606,14 @@ if (h->GetItemCount()) { dummyflag = true; - while (m_pList->GetHeaderCtrl()->GetItemCount()>1) + while (m_pList->GetHeaderCtrl()->GetItemCount() > 1) m_pList->DeleteColumn(1); } - for (int i=0; i<m_dispcols; ++i) + for (int i = 0; i < m_dispcols; ++i) { LVCOLUMN lvc; - lvc.mask = LVCF_FMT+LVCF_SUBITEM+LVCF_TEXT; + lvc.mask = LVCF_FMT + LVCF_SUBITEM + LVCF_TEXT; lvc.fmt = LVCFMT_LEFT; lvc.cx = 0; lvc.pszText = _T("text"); @@ -2627,7 +2629,7 @@ // Necessary when user reorders columns void CDirView::SetColumnWidths() { - for (int i=0; i<m_numcols; ++i) + for (int i = 0; i < m_numcols; ++i) { int phy = ColLogToPhys(i); if (phy >= 0) @@ -2642,7 +2644,7 @@ /** @brief store current column widths into registry */ void CDirView::SaveColumnWidths() { - for (int i=0; i < m_numcols; i++) + for (int i = 0; i < m_numcols; i++) { int phy = ColLogToPhys(i); if (phy >= 0) @@ -2660,7 +2662,7 @@ PostMessage(WM_TIMER, COLUMN_REORDER); } -void CDirView::OnTimer(UINT_PTR nIDEvent) +void CDirView::OnTimer(UINT_PTR nIDEvent) { if (nIDEvent == COLUMN_REORDER) { @@ -2741,7 +2743,7 @@ SaveColumnOrders(); } -void CDirView::OnCtxtOpenWithUnpacker() +void CDirView::OnCtxtOpenWithUnpacker() { int sel = -1; sel = m_pList->GetNextItem(sel, LVNI_SELECTED); @@ -2762,7 +2764,7 @@ } -void CDirView::OnUpdateCtxtOpenWithUnpacker(CCmdUI* pCmdUI) +void CDirView::OnUpdateCtxtOpenWithUnpacker(CCmdUI* pCmdUI) { if (!GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED)) { @@ -2775,7 +2777,7 @@ pCmdUI->Enable(FALSE); else { - int sel=-1; + int sel = -1; sel = m_pList->GetNextItem(sel, LVNI_SELECTED); const DIFFITEM& di = GetDiffItem(sel); if (IsItemDeletableOnBoth(di)) @@ -2791,7 +2793,7 @@ void CDirView::GetCurrentColRegKeys(CStringArray & colKeys) { int nphyscols = GetListCtrl().GetHeaderCtrl()->GetItemCount(); - for (int col=0; col<nphyscols; ++col) + for (int col = 0; col < nphyscols; ++col) { int logcol = ColPhysToLog(col); colKeys.Add(GetColRegValueNameBase(logcol)); @@ -2801,7 +2803,7 @@ /** * @brief Generate report from dir compare results. */ -void CDirView::OnToolsGenerateReport() +void CDirView::OnToolsGenerateReport() { CDirDoc *pDoc = GetDocument(); if (!pDoc->HasDiffs()) @@ -2881,7 +2883,7 @@ /** * @brief Zip selected files from left side. */ -void CDirView::OnCtxtDirZipLeft() +void CDirView::OnCtxtDirZipLeft() { if (!HasZipSupport()) { @@ -2892,14 +2894,14 @@ DirItemEnumerator ( this, LVNI_SELECTED - | DirItemEnumerator::Left + | DirItemEnumerator::Left ).CompressArchive(); } /** * @brief Zip selected files from right side. */ -void CDirView::OnCtxtDirZipRight() +void CDirView::OnCtxtDirZipRight() { if (!HasZipSupport()) { @@ -2910,14 +2912,14 @@ DirItemEnumerator ( this, LVNI_SELECTED - | DirItemEnumerator::Right + | DirItemEnumerator::Right ).CompressArchive(); } /** * @brief Zip selected files from both sides, using original/altered format. */ -void CDirView::OnCtxtDirZipBoth() +void CDirView::OnCtxtDirZipBoth() { if (!HasZipSupport()) { @@ -2928,16 +2930,16 @@ DirItemEnumerator ( this, LVNI_SELECTED - | DirItemEnumerator::Original - | DirItemEnumerator::Altered - | DirItemEnumerator::BalanceFolders + | DirItemEnumerator::Original + | DirItemEnumerator::Altered + | DirItemEnumerator::BalanceFolders ).CompressArchive(); } /** * @brief Zip selected diffs from both sides, using original/altered format. */ -void CDirView::OnCtxtDirZipBothDiffsOnly() +void CDirView::OnCtxtDirZipBothDiffsOnly() { if (!HasZipSupport()) { @@ -2948,10 +2950,10 @@ DirItemEnumerator ( this, LVNI_SELECTED - | DirItemEnumerator::Original - | DirItemEnumerator::Altered - | DirItemEnumerator::BalanceFolders - | DirItemEnumerator::DiffsOnly + | DirItemEnumerator::Original + | DirItemEnumerator::Altered + | DirItemEnumerator::BalanceFolders + | DirItemEnumerator::DiffsOnly ).CompressArchive(); } @@ -3031,7 +3033,7 @@ */ void CDirView::ResetColumnWidths() { - for (int i=0; i < m_numcols; i++) + for (int i = 0; i < m_numcols; i++) { int phy = ColLogToPhys(i); if (phy >= 0) @@ -3220,19 +3222,19 @@ /** * @brief update menu item */ -void CDirView::OnUpdateHideFilenames(CCmdUI* pCmdUI) +void CDirView::OnUpdateHideFilenames(CCmdUI* pCmdUI) { pCmdUI->Enable(m_pList->GetSelectedCount() != 0); } /// User chose (context menu) Move left to... -void CDirView::OnCtxtDirMoveLeftTo() +void CDirView::OnCtxtDirMoveLeftTo() { DoMoveLeftTo(); } /// User chose (context menu) Move right to... -void CDirView::OnCtxtDirMoveRightTo() +void CDirView::OnCtxtDirMoveRightTo() { DoMoveRightTo(); } @@ -3240,7 +3242,7 @@ /** * @brief Update "Move | Right to..." item */ -void CDirView::OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI) +void CDirView::OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI) { // Because move deletes original item, origin side // cannot be read-only @@ -3255,7 +3257,7 @@ /** * @brief Update "Move | Left to..." item */ -void CDirView::OnUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI) +void CDirView::OnUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI) { // Because move deletes original item, origin side // cannot be read-only @@ -3303,7 +3305,7 @@ // If item's selected state changed if ((pNMListView->uOldState & LVIS_SELECTED) != - (pNMListView->uNewState & LVIS_SELECTED)) + (pNMListView->uNewState & LVIS_SELECTED)) { CString msg; int items = GetSelectedCount(); @@ -3397,7 +3399,7 @@ /** * @brief Called to update the item count in the status bar */ -void CDirView::OnUpdateStatusNum(CCmdUI* pCmdUI) +void CDirView::OnUpdateStatusNum(CCmdUI* pCmdUI) { CString s; // text to display @@ -3427,7 +3429,7 @@ --focusItem; --count; } - sIdx.Format(_T("%ld"), focusItem+1); + sIdx.Format(_T("%ld"), focusItem + 1); sCnt.Format(_T("%ld"), count); // "Item %1 of %2" LangFormatString2(s, IDS_DIRVIEW_STATUS_FMT_FOCUS, sIdx, sCnt); @@ -3563,7 +3565,7 @@ /** * @brief Update "File Encoding" item */ -void CDirView::OnUpdateFileEncoding(CCmdUI* pCmdUI) +void CDirView::OnUpdateFileEncoding(CCmdUI* pCmdUI) { DoUpdateFileEncodingDialog(pCmdUI); } @@ -3595,7 +3597,7 @@ /** * @brief Allow edit "Paste" when renaming an item. */ -void CDirView::OnEditCopy() +void CDirView::OnEditCopy() { CEdit *pEdit = m_pList->GetEditControl(); if (NULL != pEdit) @@ -3607,7 +3609,7 @@ /** * @brief Allow edit "Cut" when renaming an item. */ -void CDirView::OnEditCut() +void CDirView::OnEditCut() { CEdit *pEdit = m_pList->GetEditControl(); if (NULL != pEdit) @@ -3619,7 +3621,7 @@ /** * @brief Allow edit "Paste" when renaming an item. */ -void CDirView::OnEditPaste() +void CDirView::OnEditPaste() { CEdit *pEdit = m_pList->GetEditControl(); if (NULL != pEdit) @@ -3631,7 +3633,7 @@ /** * @brief Allow edit "Undo" when renaming an item. */ -void CDirView::OnEditUndo() +void CDirView::OnEditUndo() { CEdit *pEdit = m_pList->GetEditControl(); if (NULL != pEdit) @@ -3670,7 +3672,7 @@ * @brief Returns CShellContextMenu object that owns given HMENU. * * @param [in] hMenu Handle to the menu to check ownership of. - * @return Either m_pShellContextMenuLeft, m_pShellContextMenuRight + * @return Either m_pShellContextMenuLeft, m_pShellContextMenuRight * or NULL if hMenu is not owned by these two. */ CShellContextMenu* CDirView::GetCorrespondingShellContextMenu(HMENU hMenu) const Modified: branches/R2_14/Src/DirView.h =================================================================== --- branches/R2_14/Src/DirView.h 2010-10-18 09:16:32 UTC (rev 7314) +++ branches/R2_14/Src/DirView.h 2010-10-18 13:52:00 UTC (rev 7315) @@ -21,7 +21,7 @@ * @file DirView.h * * @brief Declaration of class CDirView - */ + */ // // ID line follows -- this is updated by SVN // $Id$ @@ -60,15 +60,15 @@ // and each set of flags is in a different hex digit // to make debugging easier // These can always be packed down in the future - INVALID_CODE=0, - VISIBILITY=0x3, VISIBLE=0x1, HIDDEN=0x2, EXPANDED=0x4 + INVALID_CODE = 0, + VISIBILITY = 0x3, VISIBLE = 0x1, HIDDEN = 0x2, EXPANDED = 0x4 }; }; /** * @brief Position value for special items (..) in directory compare view. */ -const UINT_PTR SPECIAL_ITEM_POS = (UINT_PTR)-1L; +const UINT_PTR SPECIAL_ITEM_POS = (UINT_PTR) - 1L; /** Default column width in directory compare */ const UINT DefColumnWidth = 150; @@ -127,7 +127,7 @@ // Implementation types private: - typedef enum { SIDE_LEFT=1, SIDE_RIGHT } SIDE_TYPE; + typedef enum { SIDE_LEFT = 1, SIDE_RIGHT } SIDE_TYPE; // Implementation in DirActions.cpp private: @@ -230,9 +230,9 @@ // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CDirView) - public: +public: virtual void OnInitialUpdate(); - protected: +protected: virtual BOOL PreTranslateMessage(MSG* pMsg); virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult); virtual BOOL OnChildNotify(UINT, WPARAM, LPARAM, LRESULT*); @@ -251,9 +251,9 @@ void WarnContentsChanged(const CString & failedPath); void OpenSpecialItems(UINT_PTR pos1, UINT_PTR pos2); bool OpenOneItem(UINT_PTR pos1, DIFFITEM **di1, DIFFITEM **di2, - String &path1, String &path2, int & sel1, bool & isDir); + String &path1, String &path2, int & sel1, bool & isDir); bool OpenTwoItems(UINT_PTR pos1, UINT_PTR pos2, DIFFITEM **di1, DIFFITEM **di2, - String &path1, String &path2, int & sel1, int & sel2, bool & isDir); + String &path1, String &path2, int & sel1, int & sel2, bool & isDir); bool CreateFoldersPair(DIFFITEM & di, bool side1); // Implementation data @@ -265,7 +265,7 @@ CListCtrl * m_pList; int m_numcols; int m_dispcols; - std::vector<int> m_colorder; /**< colorder[logical#]=physical# */ + std::vector<int> m_colorder; /**< colorder[logical#]=physical# */ std::vector<int> m_invcolorder; /**< invcolorder[physical]=logical# */ BOOL m_bEscCloses; /**< Cached value for option for ESC closing window */ CFont m_font; /**< User-selected font */ @@ -447,7 +447,7 @@ #ifndef _DEBUG // debug version in DirView.cpp inline CDirDoc* CDirView::GetDocument() - { return (CDirDoc*)m_pDocument; } +{ return (CDirDoc*)m_pDocument; } #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-20 20:40:42
|
Revision: 7328 http://winmerge.svn.sourceforge.net/winmerge/?rev=7328&view=rev Author: gerundt Date: 2010-10-20 20:40:36 +0000 (Wed, 20 Oct 2010) Log Message: ----------- Remove MFC dependency from varprop class in R2_14 Modified Paths: -------------- branches/R2_14/Src/Common/varprop.cpp branches/R2_14/Src/Common/varprop.h branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/MergeX64.vcproj Modified: branches/R2_14/Src/Common/varprop.cpp =================================================================== --- branches/R2_14/Src/Common/varprop.cpp 2010-10-20 20:25:08 UTC (rev 7327) +++ branches/R2_14/Src/Common/varprop.cpp 2010-10-20 20:40:36 UTC (rev 7328) @@ -7,15 +7,10 @@ // $Id$ ////////////////////////////////////////////////////////////////////// -#include "StdAfx.h" +#include "windows.h" #include "varprop.h" +#include "assert.h" -#ifdef _DEBUG -#undef THIS_FILE -static char THIS_FILE[]=__FILE__; -#define new DEBUG_NEW -#endif - namespace varprop { /** @@ -145,7 +140,7 @@ */ bool VariantValue::GetBool() const { - ASSERT(m_vtype == VT_BOOL); + assert(m_vtype == VT_BOOL); return m_bvalue; } @@ -155,7 +150,7 @@ */ int VariantValue::GetInt() const { - ASSERT(m_vtype == VT_INT); + assert(m_vtype == VT_INT); return m_ivalue; } @@ -165,7 +160,7 @@ */ double VariantValue::GetFloat() const { - ASSERT(m_vtype == VT_FLOAT); + assert(m_vtype == VT_FLOAT); return m_fvalue; } @@ -175,7 +170,7 @@ */ String VariantValue::GetString() const { - ASSERT(m_vtype == VT_STRING); + assert(m_vtype == VT_STRING); return m_svalue; } @@ -185,7 +180,7 @@ */ time_t VariantValue::GetTime() const { - ASSERT(m_vtype == VT_TIME); + assert(m_vtype == VT_TIME); return m_tvalue; } Modified: branches/R2_14/Src/Common/varprop.h =================================================================== --- branches/R2_14/Src/Common/varprop.h 2010-10-20 20:25:08 UTC (rev 7327) +++ branches/R2_14/Src/Common/varprop.h 2010-10-20 20:40:36 UTC (rev 7328) @@ -10,6 +10,8 @@ #ifndef varprop_h_included #define varprop_h_included +#include "UnicodeString.h" + namespace varprop { Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-10-20 20:25:08 UTC (rev 7327) +++ branches/R2_14/Src/Merge.vcproj 2010-10-20 20:40:36 UTC (rev 7328) @@ -5673,7 +5673,10 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/> </FileConfiguration> <FileConfiguration Name="UnicodeDebug|Win32"> @@ -5682,6 +5685,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1"/> </FileConfiguration> <FileConfiguration @@ -5691,6 +5697,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1"/> </FileConfiguration> <FileConfiguration @@ -5699,7 +5708,10 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/> </FileConfiguration> </File> <File Modified: branches/R2_14/Src/MergeX64.vcproj =================================================================== --- branches/R2_14/Src/MergeX64.vcproj 2010-10-20 20:25:08 UTC (rev 7327) +++ branches/R2_14/Src/MergeX64.vcproj 2010-10-20 20:40:36 UTC (rev 7328) @@ -19465,6 +19465,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -19475,6 +19478,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -19485,6 +19491,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -19496,6 +19505,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -19507,6 +19519,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -19518,6 +19533,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -19529,6 +19547,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -19539,6 +19560,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -19549,6 +19573,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -19560,6 +19587,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -19571,6 +19601,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -19581,6 +19614,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-21 20:47:14
|
Revision: 7334 http://winmerge.svn.sourceforge.net/winmerge/?rev=7334&view=rev Author: gerundt Date: 2010-10-21 20:47:08 +0000 (Thu, 21 Oct 2010) Log Message: ----------- Remove unused variables in R2_14 Modified Paths: -------------- branches/R2_14/Src/Common/LanguageSelect.cpp branches/R2_14/Src/DiffWrapper.cpp branches/R2_14/Src/DirColsDlg.cpp branches/R2_14/Src/DirView.cpp branches/R2_14/Src/LocationView.cpp branches/R2_14/Src/MergeDoc.cpp branches/R2_14/Src/UniMarkdownFile.cpp branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp branches/R2_14/Src/editlib/ccrystaltextview.cpp branches/R2_14/Src/editlib/crystalparser.cpp Modified: branches/R2_14/Src/Common/LanguageSelect.cpp =================================================================== --- branches/R2_14/Src/Common/LanguageSelect.cpp 2010-10-21 18:29:15 UTC (rev 7333) +++ branches/R2_14/Src/Common/LanguageSelect.cpp 2010-10-21 20:47:08 UTC (rev 7334) @@ -978,7 +978,6 @@ while (i > 0) { --i; - UINT id = 0; MENUITEMINFO mii; mii.cbSize = sizeof mii; mii.fMask = MIIM_STATE|MIIM_ID|MIIM_SUBMENU|MIIM_DATA; @@ -1088,10 +1087,6 @@ HMENU hNewDirMenu = pMainFrame->NewDirViewMenu(); if (hNewDefaultMenu && hNewMergeMenu && hNewDirMenu) { - CMenu* pOldDefaultMenu = CMenu::FromHandle(pMainFrame->m_hMenuDefault); - CMenu* hOldMergeMenu = CMenu::FromHandle(pApp->m_pDiffTemplate->m_hMenuShared); - CMenu* hOldDirMenu = CMenu::FromHandle(pApp->m_pDirTemplate->m_hMenuShared); - // Note : for Windows98 compatibility, use FromHandle and not Attach/Detach CMenu * pNewDefaultMenu = CMenu::FromHandle(hNewDefaultMenu); CMenu * pNewMergeMenu = CMenu::FromHandle(hNewMergeMenu); Modified: branches/R2_14/Src/DiffWrapper.cpp =================================================================== --- branches/R2_14/Src/DiffWrapper.cpp 2010-10-21 18:29:15 UTC (rev 7333) +++ branches/R2_14/Src/DiffWrapper.cpp 2010-10-21 20:47:08 UTC (rev 7334) @@ -359,7 +359,6 @@ LineData.erase(EolPos); } - int Len = LineData.size(); const char * StartOfComment = strstr(LineData.c_str(), filtercommentsset.StartMarker.c_str()); const char * EndOfComment = strstr(LineData.c_str(), filtercommentsset.EndMarker.c_str()); const char * InLineComment = strstr(LineData.c_str(), filtercommentsset.InlineMarker.c_str()); Modified: branches/R2_14/Src/DirColsDlg.cpp =================================================================== --- branches/R2_14/Src/DirColsDlg.cpp 2010-10-21 18:29:15 UTC (rev 7333) +++ branches/R2_14/Src/DirColsDlg.cpp 2010-10-21 20:47:08 UTC (rev 7334) @@ -274,7 +274,6 @@ */ void CDirColsDlg::OnLvnItemchangedColdlgList(NMHDR *pNMHDR, LRESULT *pResult) { - LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR); POSITION pos = m_listColumns.GetFirstSelectedItemPosition(); if (pos) Modified: branches/R2_14/Src/DirView.cpp =================================================================== --- branches/R2_14/Src/DirView.cpp 2010-10-21 18:29:15 UTC (rev 7333) +++ branches/R2_14/Src/DirView.cpp 2010-10-21 20:47:08 UTC (rev 7334) @@ -534,7 +534,6 @@ } int alldiffs = 0; - int level = 0; UINT_PTR diffpos = ctxt.GetFirstDiffPosition(); RedisplayChildren(diffpos, 0, cnt, alldiffs); theApp.SetLastCompareResult(alldiffs); Modified: branches/R2_14/Src/LocationView.cpp =================================================================== --- branches/R2_14/Src/LocationView.cpp 2010-10-21 18:29:15 UTC (rev 7333) +++ branches/R2_14/Src/LocationView.cpp 2010-10-21 20:47:08 UTC (rev 7334) @@ -672,7 +672,6 @@ GetClientRect(rc); int line = -1; - int lineOther = -1; int bar = IsInsideBar(rc, point); if (bar == BAR_LEFT || bar == BAR_RIGHT) { @@ -898,16 +897,13 @@ CRect rc; GetClientRect(rc); - const double hTotal = rc.Height() - (2 * Y_OFFSET); // Height of draw area const int nbLines = min(m_view[MERGE_VIEW_LEFT]->GetSubLineCount(), m_view[MERGE_VIEW_RIGHT]->GetSubLineCount()); int nTopCoord = static_cast<int>(Y_OFFSET + (static_cast<double>(nTopLine * m_lineInPix))); - int nLeftCoord = INDICATOR_MARGIN; int nBottomCoord = static_cast<int>(Y_OFFSET + (static_cast<double>(nBottomLine * m_lineInPix))); - int nRightCoord = rc.Width() - INDICATOR_MARGIN; double xbarBottom = min(nbLines / m_pixInLines + Y_OFFSET, rc.Height() - Y_OFFSET); int barBottom = (int)xbarBottom; Modified: branches/R2_14/Src/MergeDoc.cpp =================================================================== --- branches/R2_14/Src/MergeDoc.cpp 2010-10-21 18:29:15 UTC (rev 7333) +++ branches/R2_14/Src/MergeDoc.cpp 2010-10-21 20:47:08 UTC (rev 7334) @@ -1353,7 +1353,6 @@ */ static void UnescapeControlChars(CString &s) { - int n = s.GetLength(); LPTSTR p = s.LockBuffer(); LPTSTR q = p; while ((*p = *q) != _T('\0')) Modified: branches/R2_14/Src/UniMarkdownFile.cpp =================================================================== --- branches/R2_14/Src/UniMarkdownFile.cpp 2010-10-21 18:29:15 UTC (rev 7333) +++ branches/R2_14/Src/UniMarkdownFile.cpp 2010-10-21 20:47:08 UTC (rev 7334) @@ -193,7 +193,6 @@ { while (m_current < m_base + m_filesize && isspace(*m_current)) { - LPBYTE current = m_current; BYTE eol = *m_current++; if (eol == '\r' || eol == '\n') { Modified: branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp =================================================================== --- branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp 2010-10-21 18:29:15 UTC (rev 7333) +++ branches/R2_14/Src/editlib/ccrystaltextbuffer.cpp 2010-10-21 20:47:08 UTC (rev 7334) @@ -1831,8 +1831,6 @@ // You must call InitNew() or LoadFromFile() first! #ifdef _UNICODE - LPCTSTR string = (LPCTSTR) GetLineChars (nLine); - LPCTSTR current = string + nCol; return FALSE; #else // _UNICODE const unsigned char *string = (const unsigned char *) GetLineChars (nLine); @@ -1850,8 +1848,6 @@ // You must call InitNew() or LoadFromFile() first! #ifdef _UNICODE - LPCTSTR string = (LPCTSTR) GetLineChars (nLine); - LPCTSTR current = string + nCol; return FALSE; #else // _UNICODE const unsigned char *string = (const unsigned char *) GetLineChars (nLine); Modified: branches/R2_14/Src/editlib/ccrystaltextview.cpp =================================================================== --- branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-21 18:29:15 UTC (rev 7333) +++ branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-10-21 20:47:08 UTC (rev 7334) @@ -983,7 +983,6 @@ const int nCharWidthNarrowed = nCharWidth / 2; const int nCharWidthWidened = nCharWidth * 2 - nCharWidthNarrowed; const int nLineHeight = GetLineHeight(); - int nSumWidth = 0; // i the character index, from 0 to lineLen-1 int i = 0; @@ -2102,7 +2101,6 @@ rcCacheLine.OffsetRect( 0, nSubLineOffset * nLineHeight ); } - const int nMaxLineChars = GetScreenChars(); //END SW int nCurrentLine = m_nTopLine; @@ -2941,8 +2939,6 @@ int nCurrentLine; for (nCurrentLine = nTopLine; nCurrentLine <= nEndLine; nCurrentLine++) { - int nSubLines = GetSubLines (nCurrentLine); - rcLine.bottom = rcLine.top + GetSubLines (nCurrentLine) * nLineHeight; rcMargin.bottom = rcLine.bottom; Modified: branches/R2_14/Src/editlib/crystalparser.cpp =================================================================== --- branches/R2_14/Src/editlib/crystalparser.cpp 2010-10-21 18:29:15 UTC (rev 7333) +++ branches/R2_14/Src/editlib/crystalparser.cpp 2010-10-21 20:47:08 UTC (rev 7334) @@ -58,7 +58,6 @@ int nTabWidth = m_pTextView->GetTabSize(); int nLineCharCount = 0; int nCharCount = 0; - int nCharPos = 0; LPCTSTR szLine = m_pTextView->GetLineChars( nLineIndex ); int nLastBreakPos = 0; int nLastCharBreakPos = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-21 21:31:31
|
Revision: 7336 http://winmerge.svn.sourceforge.net/winmerge/?rev=7336&view=rev Author: gerundt Date: 2010-10-21 21:31:24 +0000 (Thu, 21 Oct 2010) Log Message: ----------- PATCH: [ 3015396 ] Remove obsolete dll version checks Modified Paths: -------------- branches/R2_14/Src/DirColsDlg.cpp branches/R2_14/Src/DirView.cpp branches/R2_14/Src/FileFiltersDlg.cpp branches/R2_14/Src/PluginsListDlg.cpp Modified: branches/R2_14/Src/DirColsDlg.cpp =================================================================== --- branches/R2_14/Src/DirColsDlg.cpp 2010-10-21 21:19:24 UTC (rev 7335) +++ branches/R2_14/Src/DirColsDlg.cpp 2010-10-21 21:31:24 UTC (rev 7336) @@ -12,7 +12,6 @@ #include "stdafx.h" #include "merge.h" #include "DirColsDlg.h" -#include "dllver.h" #include <algorithm> #ifdef _DEBUG @@ -63,13 +62,8 @@ void CDirColsDlg::InitList() { // Show selection across entire row. - DWORD newstyle = LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT; - // Also enable infotips if they have new enough version for our - // custom draw code - // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71 - if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71)) - newstyle |= LVS_EX_INFOTIP; - m_listColumns.SetExtendedStyle(m_listColumns.GetExtendedStyle() | newstyle); + // Also enable infotips. + m_listColumns.SetExtendedStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP); m_listColumns.InsertColumn(0, _T(""), LVCFMT_LEFT, 150); } Modified: branches/R2_14/Src/DirView.cpp =================================================================== --- branches/R2_14/Src/DirView.cpp 2010-10-21 21:19:24 UTC (rev 7335) +++ branches/R2_14/Src/DirView.cpp 2010-10-21 21:31:24 UTC (rev 7336) @@ -38,7 +38,6 @@ #include "resource.h" #include "coretools.h" #include "WaitStatusCursor.h" -#include "dllver.h" #include "locality.h" #include "FileTransform.h" #include "SelectUnpackerDlg.h" @@ -329,14 +328,9 @@ ReloadColumns(); // Show selection across entire row. - // Also allow user to rearrange columns via drag&drop of headers - // if they have a new enough common controls - DWORD exstyle = LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP; - // Also enable infotips if they have new enough version for our - // custom draw code - // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71 - if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71)) - exstyle |= LVS_EX_INFOTIP; + // Also allow user to rearrange columns via drag&drop of headers. + // Also enable infotips. + DWORD exstyle = LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP | LVS_EX_INFOTIP; m_pList->SetExtendedStyle(exstyle); } @@ -2613,10 +2607,6 @@ */ void CDirView::FixReordering() { - // LVCOLUMN.iOrder is present with version 4.70+ - if (GetDllVersion(_T("shlwapi.dll")) < PACKVERSION(4,70)) - return; - LVCOLUMN lvcol; lvcol.mask = LVCF_ORDER; lvcol.fmt = 0; Modified: branches/R2_14/Src/FileFiltersDlg.cpp =================================================================== --- branches/R2_14/Src/FileFiltersDlg.cpp 2010-10-21 21:19:24 UTC (rev 7335) +++ branches/R2_14/Src/FileFiltersDlg.cpp 2010-10-21 21:31:24 UTC (rev 7336) @@ -28,7 +28,6 @@ #include "MainFrm.h" #include "FileFiltersDlg.h" #include "coretools.h" -#include "dllver.h" #include "FileFilterMgr.h" #include "paths.h" #include "SharedFilterDlg.h" @@ -125,13 +124,8 @@ void FileFiltersDlg::InitList() { // Show selection across entire row. - DWORD newstyle = LVS_EX_FULLROWSELECT; - // Also enable infotips if they have new enough version for our - // custom draw code - // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71 - if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71)) - newstyle |= LVS_EX_INFOTIP; - m_listFilters.SetExtendedStyle(m_listFilters.GetExtendedStyle() | newstyle); + // Also enable infotips. + m_listFilters.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP); String title = theApp.LoadString(IDS_FILTERFILE_NAMETITLE); m_listFilters.InsertColumn(0, title.c_str(), LVCFMT_LEFT, 150); @@ -320,12 +314,6 @@ NMLVGETINFOTIP * pInfoTip = reinterpret_cast<NMLVGETINFOTIP*>(pNMHDR); ASSERT(pInfoTip); - if (GetDllVersion(_T("comctl32.dll")) < PACKVERSION(4,71)) - { - // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71 - return; - } - // Get subitem under mouse cursor lvhti.pt = m_ptLastMousePos; m_listFilters.SubItemHitTest(&lvhti); Modified: branches/R2_14/Src/PluginsListDlg.cpp =================================================================== --- branches/R2_14/Src/PluginsListDlg.cpp 2010-10-21 21:19:24 UTC (rev 7335) +++ branches/R2_14/Src/PluginsListDlg.cpp 2010-10-21 21:31:24 UTC (rev 7336) @@ -10,7 +10,6 @@ #include "UnicodeString.h" #include "Merge.h" #include "Plugins.h" -#include "dllver.h" #include "PluginsListDlg.h" #include "OptionsDef.h" @@ -69,13 +68,8 @@ void PluginsListDlg::InitList() { // Show selection across entire row. - DWORD newstyle = LVS_EX_FULLROWSELECT; - // Also enable infotips if they have new enough version for our - // custom draw code - // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71 - if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71)) - newstyle |= LVS_EX_INFOTIP; - m_list.SetExtendedStyle(m_list.GetExtendedStyle() | newstyle); + // Also enable infotips. + m_list.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_INFOTIP); String title = LoadResString(IDS_PLUGINSLIST_NAME); m_list.InsertColumn(0, title.c_str(), LVCFMT_LEFT, 150); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-21 22:20:24
|
Revision: 7337 http://winmerge.svn.sourceforge.net/winmerge/?rev=7337&view=rev Author: gerundt Date: 2010-10-21 22:20:18 +0000 (Thu, 21 Oct 2010) Log Message: ----------- Remove unnecessary #include "dllver.h" - R2_14 Modified Paths: -------------- branches/R2_14/Src/ConfigLog.cpp branches/R2_14/Src/DirViewColHandler.cpp branches/R2_14/Src/FilepathEdit.cpp branches/R2_14/Src/MergeDoc.cpp Modified: branches/R2_14/Src/ConfigLog.cpp =================================================================== --- branches/R2_14/Src/ConfigLog.cpp 2010-10-21 21:31:24 UTC (rev 7336) +++ branches/R2_14/Src/ConfigLog.cpp 2010-10-21 22:20:18 UTC (rev 7337) @@ -28,7 +28,6 @@ #endif #include "Constants.h" #include "version.h" -#include "dllver.h" #include "DiffWrapper.h" #include "ConfigLog.h" #include "winnt_supp.h" Modified: branches/R2_14/Src/DirViewColHandler.cpp =================================================================== --- branches/R2_14/Src/DirViewColHandler.cpp 2010-10-21 21:31:24 UTC (rev 7336) +++ branches/R2_14/Src/DirViewColHandler.cpp 2010-10-21 22:20:18 UTC (rev 7337) @@ -15,7 +15,6 @@ #include "DirDoc.h" #include "resource.h" #include "coretools.h" -#include "dllver.h" #include "DirViewColItems.h" #include "DirColsDlg.h" #include "OptionsDef.h" Modified: branches/R2_14/Src/FilepathEdit.cpp =================================================================== --- branches/R2_14/Src/FilepathEdit.cpp 2010-10-21 21:31:24 UTC (rev 7336) +++ branches/R2_14/Src/FilepathEdit.cpp 2010-10-21 22:20:18 UTC (rev 7337) @@ -31,7 +31,6 @@ #include "BCMenu.h" #include "FilepathEdit.h" #include "Shlwapi.h" -#include "dllVer.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/MergeDoc.cpp =================================================================== --- branches/R2_14/Src/MergeDoc.cpp 2010-10-21 21:31:24 UTC (rev 7336) +++ branches/R2_14/Src/MergeDoc.cpp 2010-10-21 22:20:18 UTC (rev 7337) @@ -54,7 +54,6 @@ #include "DiffFileInfo.h" #include "SaveClosingDlg.h" #include "DiffList.h" -#include "dllver.h" #include "codepage.h" #include "paths.h" #include "OptionsMgr.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-22 17:45:59
|
Revision: 7342 http://winmerge.svn.sourceforge.net/winmerge/?rev=7342&view=rev Author: gerundt Date: 2010-10-22 17:45:52 +0000 (Fri, 22 Oct 2010) Log Message: ----------- Remove MFC dependency from CompareOptions class. - R2_14 Modified Paths: -------------- branches/R2_14/Src/CompareOptions.cpp branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/MergeX64.vcproj Modified: branches/R2_14/Src/CompareOptions.cpp =================================================================== --- branches/R2_14/Src/CompareOptions.cpp 2010-10-22 16:45:47 UTC (rev 7341) +++ branches/R2_14/Src/CompareOptions.cpp 2010-10-22 17:45:52 UTC (rev 7342) @@ -6,7 +6,8 @@ // ID line follows -- this is updated by SVN // $Id: ByteComparator.h 3397 2006-07-27 10:41:24Z kimmov $ -#include "StdAfx.h" +#include <windows.h> +#include <crtdbg.h> #include "DIFF.H" #include "CompareOptions.h" Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-10-22 16:45:47 UTC (rev 7341) +++ branches/R2_14/Src/Merge.vcproj 2010-10-22 17:45:52 UTC (rev 7342) @@ -780,7 +780,10 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/> </FileConfiguration> <FileConfiguration Name="UnicodeDebug|Win32"> @@ -789,6 +792,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1"/> </FileConfiguration> <FileConfiguration @@ -798,6 +804,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1"/> </FileConfiguration> <FileConfiguration @@ -806,7 +815,10 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/> </FileConfiguration> </File> <File Modified: branches/R2_14/Src/MergeX64.vcproj =================================================================== --- branches/R2_14/Src/MergeX64.vcproj 2010-10-22 16:45:47 UTC (rev 7341) +++ branches/R2_14/Src/MergeX64.vcproj 2010-10-22 17:45:52 UTC (rev 7342) @@ -2746,6 +2746,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -2756,6 +2759,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -2766,6 +2772,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -2777,6 +2786,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -2788,6 +2800,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -2799,6 +2814,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -2810,6 +2828,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -2820,6 +2841,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -2830,6 +2854,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -2841,6 +2868,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -2852,6 +2882,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -2862,6 +2895,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-22 18:23:06
|
Revision: 7343 http://winmerge.svn.sourceforge.net/winmerge/?rev=7343&view=rev Author: gerundt Date: 2010-10-22 18:22:59 +0000 (Fri, 22 Oct 2010) Log Message: ----------- Remove MFC dependency from CompareStats class. - R2_14 Modified Paths: -------------- branches/R2_14/Src/CompareStats.cpp branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/MergeX64.vcproj Modified: branches/R2_14/Src/CompareStats.cpp =================================================================== --- branches/R2_14/Src/CompareStats.cpp 2010-10-22 17:45:52 UTC (rev 7342) +++ branches/R2_14/Src/CompareStats.cpp 2010-10-22 18:22:59 UTC (rev 7343) @@ -6,7 +6,9 @@ // ID line follows -- this is updated by SVN // $Id$ -#include "stdafx.h" +#include <windows.h> +#include <assert.h> +#include <crtdbg.h> #include "DiffItem.h" #include "CompareStats.h" @@ -53,7 +55,7 @@ int index = static_cast<int>(res); m_counts[index] += 1; ++m_nComparedItems; - ASSERT(m_nComparedItems <= m_nTotalItems); + assert(m_nComparedItems <= m_nTotalItems); LeaveCriticalSection(&m_csProtect); } Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-10-22 17:45:52 UTC (rev 7342) +++ branches/R2_14/Src/Merge.vcproj 2010-10-22 18:22:59 UTC (rev 7343) @@ -866,7 +866,10 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/> </FileConfiguration> <FileConfiguration Name="UnicodeDebug|Win32"> @@ -875,6 +878,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1"/> </FileConfiguration> <FileConfiguration @@ -884,6 +890,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1"/> </FileConfiguration> <FileConfiguration @@ -892,7 +901,10 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/> </FileConfiguration> </File> <File Modified: branches/R2_14/Src/MergeX64.vcproj =================================================================== --- branches/R2_14/Src/MergeX64.vcproj 2010-10-22 17:45:52 UTC (rev 7342) +++ branches/R2_14/Src/MergeX64.vcproj 2010-10-22 18:22:59 UTC (rev 7343) @@ -3042,6 +3042,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -3052,6 +3055,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -3062,6 +3068,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -3073,6 +3082,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -3084,6 +3096,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -3095,6 +3110,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -3106,6 +3124,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -3116,6 +3137,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -3126,6 +3150,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -3137,6 +3164,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -3148,6 +3178,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -3158,6 +3191,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-22 18:48:15
|
Revision: 7345 http://winmerge.svn.sourceforge.net/winmerge/?rev=7345&view=rev Author: gerundt Date: 2010-10-22 18:48:06 +0000 (Fri, 22 Oct 2010) Log Message: ----------- Remove MFC dependency from FileVersion(.cpp). - R2_14 Modified Paths: -------------- branches/R2_14/Src/FileVersion.cpp branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/MergeX64.vcproj Modified: branches/R2_14/Src/FileVersion.cpp =================================================================== --- branches/R2_14/Src/FileVersion.cpp 2010-10-22 18:30:38 UTC (rev 7344) +++ branches/R2_14/Src/FileVersion.cpp 2010-10-22 18:48:06 UTC (rev 7345) @@ -6,7 +6,9 @@ // ID line follows -- this is updated by SVN // $Id$ -#include "stdafx.h" +#include <windows.h> +#include <tchar.h> +#include "coretypes.h" #include "UnicodeString.h" #include "FileVersion.h" Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-10-22 18:30:38 UTC (rev 7344) +++ branches/R2_14/Src/Merge.vcproj 2010-10-22 18:48:06 UTC (rev 7345) @@ -2522,7 +2522,10 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/> </FileConfiguration> <FileConfiguration Name="UnicodeDebug|Win32"> @@ -2531,6 +2534,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1"/> </FileConfiguration> <FileConfiguration @@ -2540,6 +2546,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1"/> </FileConfiguration> <FileConfiguration @@ -2548,7 +2557,10 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/> </FileConfiguration> </File> <File Modified: branches/R2_14/Src/MergeX64.vcproj =================================================================== --- branches/R2_14/Src/MergeX64.vcproj 2010-10-22 18:30:38 UTC (rev 7344) +++ branches/R2_14/Src/MergeX64.vcproj 2010-10-22 18:48:06 UTC (rev 7345) @@ -8722,6 +8722,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -8732,6 +8735,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -8742,6 +8748,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -8753,6 +8762,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -8764,6 +8776,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -8775,6 +8790,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -8785,6 +8803,9 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" PreprocessorDefinitions="" /> </FileConfiguration> @@ -8796,6 +8817,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -8806,6 +8830,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -8817,6 +8844,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> @@ -8828,6 +8858,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -8838,6 +8871,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-10-25 16:38:47
|
Revision: 7353 http://winmerge.svn.sourceforge.net/winmerge/?rev=7353&view=rev Author: gerundt Date: 2010-10-25 16:38:40 +0000 (Mon, 25 Oct 2010) Log Message: ----------- PATCH: [ 3093207 ] Delete dllver files Modified Paths: -------------- branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/MergeX64.vcproj Removed Paths: ------------- branches/R2_14/Src/dllver.cpp branches/R2_14/Src/dllver.h Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-10-25 16:36:42 UTC (rev 7352) +++ branches/R2_14/Src/Merge.vcproj 2010-10-25 16:38:40 UTC (rev 7353) @@ -2617,52 +2617,6 @@ </FileConfiguration> </File> <File - RelativePath="dllver.cpp" - > - <FileConfiguration - Name="UnicodeRelease|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="UnicodeDebug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File RelativePath="EditorFilepathBar.cpp" > <FileConfiguration @@ -7696,10 +7650,6 @@ > </File> <File - RelativePath="dllver.h" - > - </File> - <File RelativePath="EditorFilepathBar.h" > </File> Modified: branches/R2_14/Src/MergeX64.vcproj =================================================================== --- branches/R2_14/Src/MergeX64.vcproj 2010-10-25 16:36:42 UTC (rev 7352) +++ branches/R2_14/Src/MergeX64.vcproj 2010-10-25 16:38:40 UTC (rev 7353) @@ -7152,136 +7152,6 @@ </FileConfiguration> </File> <File - RelativePath="dllver.cpp" - > - <FileConfiguration - Name="UnicodeRelease|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="UnicodeRelease|x64" - > - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="UnicodeDebug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="UnicodeDebug|x64" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="X64 Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="X64 Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="X64 Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="X64 Release|x64" - > - <Tool - Name="VCCLCompilerTool" - Optimization="1" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File RelativePath="EditorFilepathBar.cpp" > <FileConfiguration @@ -20840,10 +20710,6 @@ > </File> <File - RelativePath="dllver.h" - > - </File> - <File RelativePath="EditorFilepathBar.h" > </File> Deleted: branches/R2_14/Src/dllver.cpp =================================================================== --- branches/R2_14/Src/dllver.cpp 2010-10-25 16:36:42 UTC (rev 7352) +++ branches/R2_14/Src/dllver.cpp 2010-10-25 16:38:40 UTC (rev 7353) @@ -1,103 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// dllver.cpp : implementation of version check for any DLL -// - -#include "stdafx.h" -// Uses MFC C++ template collection classes -#include <afxtempl.h> -// Need DLLGETVERSIONPROC from <shlwapi.h> -#include <shlwapi.h> -#include "dllver.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -static CMap<CString, LPCTSTR, long, long> f_cache; - - -// Return major/minor version number from version resource (0 if not found) -DWORD getFixedModuleVersion(HMODULE hmod) -{ - // Do current exe if module not specified - if (!hmod) - hmod = ::GetModuleHandle(NULL); - TCHAR filepath[MAX_PATH]; - if (!GetModuleFileName(hmod, filepath, sizeof(filepath))) - return 0; - DWORD dwDummyHandle; - DWORD len = GetFileVersionInfoSize(filepath, &dwDummyHandle); - CString sbuf; - LPTSTR tbuff = sbuf.GetBuffer(len/sizeof(TCHAR)); - BYTE * buf = reinterpret_cast<BYTE *>(tbuff); - if (!::GetFileVersionInfo(filepath, 0, len, buf)) - return 0; - unsigned int verlen; - LPVOID lpvi; - if (!::VerQueryValue(buf, _T("\\"), &lpvi, &verlen)) - return 0; - VS_FIXEDFILEINFO fileInfo; - fileInfo = *(VS_FIXEDFILEINFO*)lpvi; - DWORD ver = fileInfo.dwFileVersionMS; - return ver; -} - -// Load dll & return its major/minor version number -DWORD GetDllVersion_Raw(LPCTSTR lpszDllName) -{ - - HINSTANCE hinstDll; - DWORD dwVersion = 0; - - Library lib; - if (!lib.Load(lpszDllName)) - return 0; - hinstDll = lib.Inst(); - - DLLGETVERSIONPROC pDllGetVersion; - - pDllGetVersion = (DLLGETVERSIONPROC) GetProcAddress(hinstDll, "DllGetVersion"); - -/*Because some DLLs might not implement this function, you - must test for it explicitly. Depending on the particular - DLL, the lack of a DllGetVersion function can be a useful - indicator of the version. -*/ - if (pDllGetVersion) - { - DLLVERSIONINFO dvi; - HRESULT hr; - - ZeroMemory(&dvi, sizeof(dvi)); - dvi.cbSize = sizeof(dvi); - - hr = (*pDllGetVersion)(&dvi); - - if(SUCCEEDED(hr)) - { - dwVersion = PACKVERSION(dvi.dwMajorVersion, dvi.dwMinorVersion); - return dwVersion; - - } - } - // Fall back to the version resource - dwVersion = getFixedModuleVersion(lib.Inst()); - - return dwVersion; -} - -// Return dll's version number -// Use cache if figured it out before -DWORD GetDllVersion(LPCTSTR lpszDllName) -{ - LONG ver=0; - if (!f_cache.Lookup(lpszDllName, ver)) - { - ver = GetDllVersion_Raw(lpszDllName); - f_cache[lpszDllName] = ver; - } - return ver; -} - Deleted: branches/R2_14/Src/dllver.h =================================================================== --- branches/R2_14/Src/dllver.h 2010-10-25 16:36:42 UTC (rev 7352) +++ branches/R2_14/Src/dllver.h 2010-10-25 16:38:40 UTC (rev 7353) @@ -1,37 +0,0 @@ -#ifndef dllver_h_included -#define dllver_h_included - -#ifndef PACKVERSION -#define PACKVERSION(major,minor) MAKELONG(minor,major) -#endif - -// resource pattern for APIs LoadLibrary, FreeLibrary -struct Library -{ - Library() : m_hinst(0) { } - ~Library() { Unload(); } - bool Load(LPCTSTR sz) - { - Unload(); - m_hinst = LoadLibrary(sz); - return m_hinst != NULL; - } - void Unload() - { - if (m_hinst) - { - FreeLibrary(m_hinst); - m_hinst = NULL; - } - } - HINSTANCE Inst() const { return m_hinst; } -protected: - HINSTANCE m_hinst; -}; - - -DWORD getFixedModuleVersion(HMODULE hmod); -DWORD GetDllVersion_Raw(LPCTSTR lpszDllName); // checks very time -DWORD GetDllVersion(LPCTSTR lpszDllName); // checks once & caches - -#endif // dllver_h_included \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-27 18:12:14
|
Revision: 7366 http://winmerge.svn.sourceforge.net/winmerge/?rev=7366&view=rev Author: kimmov Date: 2010-10-27 18:12:07 +0000 (Wed, 27 Oct 2010) Log Message: ----------- Merge PostBuild.bat and Prelink.bat fixes for latest VS versions from trunk. Modified Paths: -------------- branches/R2_14/Src/PostBuild.bat branches/R2_14/Src/PreLink.bat Modified: branches/R2_14/Src/PostBuild.bat =================================================================== --- branches/R2_14/Src/PostBuild.bat 2010-10-27 17:20:17 UTC (rev 7365) +++ branches/R2_14/Src/PostBuild.bat 2010-10-27 18:12:07 UTC (rev 7366) @@ -1,6 +1,17 @@ @echo off -if "%_ACP_ATLPROV%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%) +REM $Id$ + +REM _ACP_ATLPROV is set by VS2005/VS2008 when compiling in IDE. But it is NOT +REM set when calling devenv from command line. + +REM This detects if the script is called from VS2003 or from IDE +if NOT "%_ACP_ATLPROV%" == "" goto IDEBuild + +REM This detects if the script is called from VS2005/VS2008 cmd line env +if "%VCBuildHelper_Command%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%) + +:IDEBuild :_MSDEV_BLD_ENV_(1) cd REM Enable echo lines below if you need to debug this script Modified: branches/R2_14/Src/PreLink.bat =================================================================== --- branches/R2_14/Src/PreLink.bat 2010-10-27 17:20:17 UTC (rev 7365) +++ branches/R2_14/Src/PreLink.bat 2010-10-27 18:12:07 UTC (rev 7366) @@ -6,8 +6,17 @@ REM _ACP_ATLPROV was introduced in VC7. If not set, assume VC6. REM _MSDEV_BLD_ENV_ was removed in VC8. Don't care about it if _ACP_ATLPROV is set. +REM _ACP_ATLPROV is set by VS2005/VS2008 when compiling in IDE. But it is NOT +REM set when calling devenv from command line. -if "%_ACP_ATLPROV%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%) +REM This detects if the script is called from VS2003 or from IDE +if NOT "%_ACP_ATLPROV%" == "" goto IDEBuild + +REM This detects if the script is called from VS2005/VS2008 cmd line env +if "%VCBuildHelper_Command%" == "" goto _MSDEV_BLD_ENV_(%_MSDEV_BLD_ENV_%) + +:IDEBuild + set msdev=rem set devenv=devenv goto Configure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-10-28 14:35:28
|
Revision: 7376 http://winmerge.svn.sourceforge.net/winmerge/?rev=7376&view=rev Author: kimmov Date: 2010-10-28 14:35:21 +0000 (Thu, 28 Oct 2010) Log Message: ----------- Fix compile after SCEW update. Modified Paths: -------------- branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/ProjectFile.cpp branches/R2_14/Src/ProjectFile.h Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-10-27 21:24:57 UTC (rev 7375) +++ branches/R2_14/Src/Merge.vcproj 2010-10-28 14:35:21 UTC (rev 7376) @@ -82,7 +82,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/verbose:lib" - AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib" + AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib scew.lib" OutputFile="..\Build\MergeUnicodeRelease\WinMergeU.exe" LinkIncremental="1" SuppressStartupBanner="true" @@ -187,7 +187,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib" + AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib scew_d.lib" OutputFile="..\Build\MergeUnicodeDebug/WinMergeU.exe" LinkIncremental="1" SuppressStartupBanner="true" @@ -291,7 +291,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib" + AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib scew_d.lib" OutputFile="..\Build\MergeDebug/WinMerge.exe" LinkIncremental="1" SuppressStartupBanner="true" @@ -397,7 +397,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/verbose:lib" - AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib" + AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib scew.lib" OutputFile="..\Build\MergeRelease/WinMerge.exe" LinkIncremental="1" SuppressStartupBanner="true" Modified: branches/R2_14/Src/ProjectFile.cpp =================================================================== --- branches/R2_14/Src/ProjectFile.cpp 2010-10-27 21:24:57 UTC (rev 7375) +++ branches/R2_14/Src/ProjectFile.cpp 2010-10-28 14:35:21 UTC (rev 7376) @@ -19,7 +19,7 @@ * * @brief Implementation file for ProjectFile class. */ -// RCS ID line follows -- this is updated by CVS +// ID line follows -- this is updated by CVS // $Id$ #include "stdafx.h" @@ -88,23 +88,30 @@ parser = scew_parser_create(); scew_parser_ignore_whitespaces(parser, 1); + scew_reader *reader = NULL; FILE * fp = _tfopen(path, _T("r")); if (fp) { - if (scew_parser_load_file_fp(parser, fp)) + reader = scew_reader_fp_create(fp); + if (reader) { - tree = scew_parser_tree(parser); + tree = scew_parser_load (parser, reader); - scew_element * root = GetRootElement(tree); - if (root) + if (tree) { - // Currently our content is paths, so expect - // having paths in valid project file! - if (GetPathsData(root)) - loaded = TRUE; - }; + scew_element * root = GetRootElement(tree); + if (root) + { + // Currently our content is paths, so expect + // having paths in valid project file! + if (GetPathsData(root)) + loaded = TRUE; + }; + } } + scew_tree_free(tree); + scew_reader_free(reader); /* Frees the SCEW parser */ scew_parser_free(parser); @@ -230,7 +237,7 @@ scew_element* paths = NULL; tree = scew_tree_create(); - root = scew_tree_add_root(tree, Root_element_name); + root = scew_tree_set_root(tree, Root_element_name); if (root != NULL) { paths = AddPathsElement(root); @@ -247,14 +254,25 @@ scew_tree_set_xml_encoding(tree, "UTF-8"); - // Set the XML file standalone - scew_tree_set_xml_standalone(tree, 1); - + scew_writer *writer = NULL; + scew_printer *printer = NULL; FILE * fp = _tfopen(path, _T("w")); if (fp) { - if (!scew_writer_tree_fp(tree, fp)) + writer = scew_writer_fp_create(fp); + if (writer) { + printer = scew_printer_create(writer); + + if (!scew_printer_print_tree(printer, tree) || + !scew_printf(_XT("\n"))) + { + success = FALSE; + *sError = theApp.LoadString(IDS_FILEWRITE_ERROR); + } + } + else + { success = FALSE; *sError = theApp.LoadString(IDS_FILEWRITE_ERROR); } @@ -267,6 +285,8 @@ /* Frees the SCEW tree */ scew_tree_free(tree); + scew_writer_free(writer); + scew_printer_free(printer); if (success == FALSE) { Modified: branches/R2_14/Src/ProjectFile.h =================================================================== --- branches/R2_14/Src/ProjectFile.h 2010-10-27 21:24:57 UTC (rev 7375) +++ branches/R2_14/Src/ProjectFile.h 2010-10-28 14:35:21 UTC (rev 7376) @@ -19,9 +19,12 @@ * * @brief Declaration file ProjectFile class */ -// RCS ID line follows -- this is updated by CVS +// ID line follows -- this is updated by CVS // $Id$ +#ifndef _PROJECT_FILE_H_ +#define _PROJECT_FILE_H_ + #include <scew/scew.h> /** @brief File extension for path files */ @@ -79,3 +82,5 @@ BOOL m_bLeftReadOnly; /**< Is left path opened as read-only */ BOOL m_bRightReadOnly; /**< Is right path opened as read-only */ }; + +#endif // #ifdef _PROJECT_FILE_H_ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jt...@us...> - 2010-10-31 14:20:20
|
Revision: 7387 http://winmerge.svn.sourceforge.net/winmerge/?rev=7387&view=rev Author: jtuc Date: 2010-10-31 14:20:14 +0000 (Sun, 31 Oct 2010) Log Message: ----------- Restore HexMerge related code which was removed for 2.12. Modified Paths: -------------- branches/R2_14/Src/DirView.cpp branches/R2_14/Src/resource.h Modified: branches/R2_14/Src/DirView.cpp =================================================================== --- branches/R2_14/Src/DirView.cpp 2010-10-31 13:18:46 UTC (rev 7386) +++ branches/R2_14/Src/DirView.cpp 2010-10-31 14:20:14 UTC (rev 7387) @@ -233,6 +233,8 @@ ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE, OnUpdateMergeCompare) ON_COMMAND(ID_MERGE_COMPARE_XML, OnMergeCompareXML) ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_XML, OnUpdateMergeCompare) + ON_COMMAND(ID_MERGE_COMPARE_HEX, OnMergeCompareHex) + ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_HEX, OnUpdateMergeCompare) ON_COMMAND(ID_VIEW_TREEMODE, OnViewTreeMode) ON_UPDATE_COMMAND_UI(ID_VIEW_TREEMODE, OnUpdateViewTreeMode) ON_COMMAND(ID_VIEW_EXPAND_ALLSUBDIRS, OnViewExpandAllSubdirs) Modified: branches/R2_14/Src/resource.h =================================================================== --- branches/R2_14/Src/resource.h 2010-10-31 13:18:46 UTC (rev 7386) +++ branches/R2_14/Src/resource.h 2010-10-31 14:20:14 UTC (rev 7387) @@ -948,6 +948,7 @@ #define ID_TOOLS_GENERATEREPORT 32868 #define ID_MERGE_COMPARE 32869 #define ID_MERGE_COMPARE_XML 32870 +#define ID_MERGE_COMPARE_HEX 32871 #define ID_UNPACK_MANUAL 32880 #define ID_UNPACK_AUTO 32881 #define ID_POPUP_OPEN_WITH_UNPACKER 32882 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jt...@us...> - 2010-11-01 09:17:38
|
Revision: 7392 http://winmerge.svn.sourceforge.net/winmerge/?rev=7392&view=rev Author: jtuc Date: 2010-11-01 09:17:31 +0000 (Mon, 01 Nov 2010) Log Message: ----------- PATCH: [ 3026022 ] Turn STL exceptions into MFC exceptions Modified Paths: -------------- branches/R2_14/Src/Merge.cpp branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/MergeX64.vcproj Modified: branches/R2_14/Src/Merge.cpp =================================================================== --- branches/R2_14/Src/Merge.cpp 2010-10-31 15:03:57 UTC (rev 7391) +++ branches/R2_14/Src/Merge.cpp 2010-11-01 09:17:31 UTC (rev 7392) @@ -71,6 +71,63 @@ /** @brief Location for command line help to open. */ static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html"); + +/** + * @brief Turn STL exceptions into MFC exceptions. + * Based on the article "Visual C++ Exception-Handling Instrumentation" + * by Eugene Gershnik, published at http://www.drdobbs.com/184416600. + * Rethrow fix inspired by http://www.spinics.net/lists/wine/msg05996.html. + */ +namespace Turn_STL_exceptions_into_MFC_exceptions +{ +# ifndef _STATIC_CPPLIB +# error This hack only works with _STATIC_CPPLIB defined. +# endif + + class CDisguisedSTLException : public CException + { + private: + std::exception *m_pSTLException; + public: + CDisguisedSTLException(std::exception *pSTLException) + : m_pSTLException(pSTLException) + { + } + virtual BOOL GetErrorMessage(LPTSTR lpszError, UINT nMaxError, PUINT) + { + _sntprintf(lpszError, nMaxError, _T("%hs"), m_pSTLException->what()); + return TRUE; + } + }; + + const DWORD CPP_EXCEPTION = 0xE06D7363; + const DWORD MS_MAGIC = 0x19930520; + + extern "C" void __stdcall _CxxThrowException(void *pObject, _s__ThrowInfo const *pObjectInfo) + { + __declspec(thread) static ULONG_PTR args[3] = { MS_MAGIC, 0, 0 }; + if (pObject == NULL) + { + pObject = reinterpret_cast<void *>(args[1]); + pObjectInfo = reinterpret_cast<_s__ThrowInfo const *>(args[2]); + } + else + { + args[1] = (ULONG_PTR)pObject; + args[2] = (ULONG_PTR)pObjectInfo; + } + if (int i = pObjectInfo->pCatchableTypeArray->nCatchableTypes) + { + const char *name = typeid(std::exception).raw_name(); + if (pObjectInfo->pCatchableTypeArray->arrayOfCatchableTypes[i - 1]->pType->name == name) + { + throw new CDisguisedSTLException(static_cast<std::exception *>(pObject)); + } + } + RaiseException(CPP_EXCEPTION, EXCEPTION_NONCONTINUABLE, _countof(args), args); + } +} + ///////////////////////////////////////////////////////////////////////////// // CMergeApp Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-10-31 15:03:57 UTC (rev 7391) +++ branches/R2_14/Src/Merge.vcproj 2010-11-01 09:17:31 UTC (rev 7392) @@ -51,7 +51,7 @@ Optimization="1" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" - PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_WINDOWS;_STATIC_CPPLIB;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -158,7 +158,7 @@ AdditionalOptions="/EHa " Optimization="0" AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_STATIC_CPPLIB;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="3" RuntimeTypeInfo="true" UsePrecompiledHeader="2" @@ -294,7 +294,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" UsePrecompiledHeader="0" PrecompiledHeaderThrough="" /> @@ -404,7 +404,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -1170,7 +1170,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -1195,7 +1195,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -1297,7 +1297,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -2077,7 +2077,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -2154,7 +2154,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -2172,22 +2172,6 @@ <File RelativePath="Merge.rc" > - <FileConfiguration - Name="UnicodeRelease|Win32" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL;$(NoInherit)" - /> - </FileConfiguration> - <FileConfiguration - Name="UnicodeDebug|Win32" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL;$(NoInherit)" - /> - </FileConfiguration> </File> <File RelativePath="MergeCmdLineInfo.cpp" @@ -2249,7 +2233,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -2478,7 +2462,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -3040,7 +3024,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -3144,7 +3128,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -3429,7 +3413,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -3529,7 +3513,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" UsePrecompiledHeader="1" /> </FileConfiguration> @@ -3968,7 +3952,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration Modified: branches/R2_14/Src/MergeX64.vcproj =================================================================== --- branches/R2_14/Src/MergeX64.vcproj 2010-10-31 15:03:57 UTC (rev 7391) +++ branches/R2_14/Src/MergeX64.vcproj 2010-11-01 09:17:31 UTC (rev 7392) @@ -55,7 +55,7 @@ Optimization="1" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" - PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_STATIC_CPPLIB" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -155,7 +155,7 @@ Optimization="1" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" - PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE" + PreprocessorDefinitions="WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_STATIC_CPPLIB" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -253,7 +253,7 @@ AdditionalOptions="/EHa " Optimization="0" AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE;_STATIC_CPPLIB" RuntimeLibrary="3" RuntimeTypeInfo="true" UsePrecompiledHeader="2" @@ -349,7 +349,7 @@ AdditionalOptions="/EHa " Optimization="0" AdditionalIncludeDirectories=".;.\CompareEngines;.\Common;.\editlib;.\diffutils;.\diffutils\lib;.\diffutils\src;..\Externals\expat\lib;..\Externals\expat\xmlwf;..\Externals\scew;..\Externals\pcre\Win32" - PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE" + PreprocessorDefinitions="_DEBUG;WIN64;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;HAVE_LIMITS_H;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_STATIC_CPPLIB" RuntimeLibrary="3" RuntimeTypeInfo="true" UsePrecompiledHeader="2" @@ -1965,7 +1965,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -1975,7 +1975,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -2029,7 +2029,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -2039,7 +2039,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -2071,7 +2071,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -2081,7 +2081,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> @@ -5837,7 +5837,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -5847,7 +5847,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -5901,7 +5901,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -5911,7 +5911,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -5943,7 +5943,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -5953,7 +5953,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> @@ -5967,7 +5967,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -5977,7 +5977,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -6031,7 +6031,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -6041,7 +6041,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -6073,7 +6073,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -6083,7 +6083,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> @@ -6499,7 +6499,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -6509,7 +6509,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -6563,7 +6563,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -6573,7 +6573,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -6605,7 +6605,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -6615,7 +6615,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> @@ -10487,7 +10487,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -10497,7 +10497,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -10551,7 +10551,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -10561,7 +10561,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -10593,7 +10593,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -10603,7 +10603,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> @@ -10889,7 +10889,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -10899,7 +10899,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -10953,7 +10953,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -10963,7 +10963,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -10995,7 +10995,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -11005,93 +11005,13 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> <File RelativePath="Merge.rc" > - <FileConfiguration - Name="UnicodeRelease|Win32" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - /> - </FileConfiguration> - <FileConfiguration - Name="UnicodeRelease|x64" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - /> - </FileConfiguration> - <FileConfiguration - Name="UnicodeDebug|Win32" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - /> - </FileConfiguration> - <FileConfiguration - Name="UnicodeDebug|x64" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" - /> - </FileConfiguration> - <FileConfiguration - Name="X64 Debug|Win32" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - /> - </FileConfiguration> - <FileConfiguration - Name="X64 Debug|x64" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG;_AFXDLL" - /> - </FileConfiguration> - <FileConfiguration - Name="X64 Release|Win32" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - /> - </FileConfiguration> - <FileConfiguration - Name="X64 Release|x64" - > - <Tool - Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_AFXDLL" - /> - </FileConfiguration> </File> <File RelativePath="MergeCmdLineInfo.cpp" @@ -11363,7 +11283,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -11373,7 +11293,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -11427,7 +11347,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -11437,7 +11357,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -11469,7 +11389,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -11479,7 +11399,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> @@ -12545,7 +12465,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -12555,7 +12475,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -12609,7 +12529,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -12619,7 +12539,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -12651,7 +12571,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -12661,7 +12581,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> @@ -15307,7 +15227,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -15317,7 +15237,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -15371,7 +15291,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -15381,7 +15301,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -15413,7 +15333,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -15423,7 +15343,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> @@ -15831,7 +15751,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -15841,7 +15761,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -15895,7 +15815,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -15905,7 +15825,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -15937,7 +15857,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -15947,7 +15867,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> @@ -17247,7 +17167,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -17257,7 +17177,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -17311,7 +17231,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -17321,7 +17241,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -17353,7 +17273,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -17363,7 +17283,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> @@ -17767,7 +17687,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" UsePrecompiledHeader="1" /> </FileConfiguration> @@ -17778,7 +17698,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" UsePrecompiledHeader="1" /> </FileConfiguration> @@ -17837,7 +17757,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" UsePrecompiledHeader="1" /> </FileConfiguration> @@ -17848,7 +17768,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" UsePrecompiledHeader="1" /> </FileConfiguration> @@ -17883,7 +17803,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" UsePrecompiledHeader="1" /> </FileConfiguration> @@ -17894,7 +17814,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" UsePrecompiledHeader="1" /> </FileConfiguration> @@ -19998,7 +19918,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -20008,7 +19928,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -20062,7 +19982,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -20072,7 +19992,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -20104,7 +20024,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration @@ -20114,7 +20034,7 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN64;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + PreprocessorDefinitions="" /> </FileConfiguration> </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-06 19:25:34
|
Revision: 7414 http://winmerge.svn.sourceforge.net/winmerge/?rev=7414&view=rev Author: gerundt Date: 2010-11-06 19:25:28 +0000 (Sat, 06 Nov 2010) Log Message: ----------- Fix a 64 bit issue Modified Paths: -------------- branches/R2_14/Src/7zCommon.cpp branches/R2_14/Src/dllpstub.h Modified: branches/R2_14/Src/7zCommon.cpp =================================================================== --- branches/R2_14/Src/7zCommon.cpp 2010-11-06 18:47:43 UTC (rev 7413) +++ branches/R2_14/Src/7zCommon.cpp 2010-11-06 19:25:28 UTC (rev 7414) @@ -735,7 +735,7 @@ */ Merge7z::Proxy Merge7z = { - 0, 0, DllBuild_Merge7z, + { 0, 0, DllBuild_Merge7z }, "Merge7z%u%02u"DECORATE_U".dll", "Merge7z" }; Modified: branches/R2_14/Src/dllpstub.h =================================================================== --- branches/R2_14/Src/dllpstub.h 2010-11-06 18:47:43 UTC (rev 7413) +++ branches/R2_14/Src/dllpstub.h 2010-11-06 19:25:28 UTC (rev 7414) @@ -36,6 +36,7 @@ DWORD dwMajorVersion; // Major version DWORD dwMinorVersion; // Minor version DWORD dwBuildNumber; // Build number + DWORD dwPadding; // Pad to 64 bit boundary static void Throw(LPCSTR name, HMODULE, DWORD dwError, BOOL bFreeLibrary); HMODULE Load(); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-11 12:22:49
|
Revision: 7418 http://winmerge.svn.sourceforge.net/winmerge/?rev=7418&view=rev Author: gerundt Date: 2010-11-11 12:22:43 +0000 (Thu, 11 Nov 2010) Log Message: ----------- Fix some whitespaces in R2_14 Modified Paths: -------------- branches/R2_14/Src/DiffList.cpp branches/R2_14/Src/DirDoc.cpp branches/R2_14/Src/DirView.cpp branches/R2_14/Src/FolderCmp.cpp branches/R2_14/Src/LocationView.cpp branches/R2_14/Src/MergeDoc.cpp Modified: branches/R2_14/Src/DiffList.cpp =================================================================== --- branches/R2_14/Src/DiffList.cpp 2010-11-11 11:06:50 UTC (rev 7417) +++ branches/R2_14/Src/DiffList.cpp 2010-11-11 12:22:43 UTC (rev 7418) @@ -467,7 +467,8 @@ */ const DIFFRANGE * DiffList::FirstSignificantDiffRange() const { - if (m_firstSignificant == -1) return NULL; + if (m_firstSignificant == -1) + return NULL; return DiffRangeAt(m_firstSignificant); } @@ -477,7 +478,8 @@ */ const DIFFRANGE * DiffList::LastSignificantDiffRange() const { - if (m_lastSignificant == -1) return NULL; + if (m_lastSignificant == -1) + return NULL; return DiffRangeAt(m_lastSignificant); } Modified: branches/R2_14/Src/DirDoc.cpp =================================================================== --- branches/R2_14/Src/DirDoc.cpp 2010-11-11 11:06:50 UTC (rev 7417) +++ branches/R2_14/Src/DirDoc.cpp 2010-11-11 12:22:43 UTC (rev 7418) @@ -313,7 +313,8 @@ */ void CDirDoc::Rescan() { - if (!m_pCtxt) return; + if (!m_pCtxt) + return; CDirFrame *pf = m_pDirView->GetParentFrame(); @@ -435,15 +436,15 @@ // users see files appearing/disappearing without clear logic. if (GetOptionsMgr()->GetBool(OPT_TREE_MODE)) { - // result filters - if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors) - return FALSE; + // result filters + if (di.diffcode.isResultError() && !GetMainFrame()->m_bShowErrors) + return FALSE; - // result filters - if (di.diffcode.isResultSame() && !GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL)) - return FALSE; - if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT)) - return FALSE; + // result filters + if (di.diffcode.isResultSame() && !GetOptionsMgr()->GetBool(OPT_SHOW_IDENTICAL)) + return FALSE; + if (di.diffcode.isResultDiff() && !GetOptionsMgr()->GetBool(OPT_SHOW_DIFFERENT)) + return FALSE; } } } Modified: branches/R2_14/Src/DirView.cpp =================================================================== --- branches/R2_14/Src/DirView.cpp 2010-11-11 11:06:50 UTC (rev 7417) +++ branches/R2_14/Src/DirView.cpp 2010-11-11 12:22:43 UTC (rev 7418) @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // ///////////////////////////////////////////////////////////////////////////// -/** +/** * @file DirView.cpp * * @brief Main implementation file for CDirView Modified: branches/R2_14/Src/FolderCmp.cpp =================================================================== --- branches/R2_14/Src/FolderCmp.cpp 2010-11-11 11:06:50 UTC (rev 7417) +++ branches/R2_14/Src/FolderCmp.cpp 2010-11-11 12:22:43 UTC (rev 7418) @@ -346,7 +346,6 @@ return code; } - /** * @brief Get actual compared paths from DIFFITEM. * @note If item is unique, same path is returned for both. Modified: branches/R2_14/Src/LocationView.cpp =================================================================== --- branches/R2_14/Src/LocationView.cpp 2010-11-11 11:06:50 UTC (rev 7417) +++ branches/R2_14/Src/LocationView.cpp 2010-11-11 12:22:43 UTC (rev 7418) @@ -927,7 +927,6 @@ nBottomCoord +=iPos; } } - } // Store current values for later use (to check if area changes) Modified: branches/R2_14/Src/MergeDoc.cpp =================================================================== --- branches/R2_14/Src/MergeDoc.cpp 2010-11-11 11:06:50 UTC (rev 7417) +++ branches/R2_14/Src/MergeDoc.cpp 2010-11-11 12:22:43 UTC (rev 7418) @@ -2828,17 +2828,16 @@ m_pDetailView[1]->SetDlgCtrlID(nLeftDetailViewId); // Swap buffers and so on - swap(m_ptBuf[0], m_ptBuf[1]); - swap(m_pView[0], m_pView[1]); - swap(m_pDetailView[0], m_pDetailView[1]); - swap(m_pSaveFileInfo[0], m_pSaveFileInfo[1]); - swap(m_pRescanFileInfo[0], m_pRescanFileInfo[1]); - swap(m_nBufferType[0], m_nBufferType[1]); - swap(m_bEditAfterRescan[0], m_bEditAfterRescan[1]); + swap(m_ptBuf[0], m_ptBuf[1]); + swap(m_pView[0], m_pView[1]); + swap(m_pDetailView[0], m_pDetailView[1]); + swap(m_pSaveFileInfo[0], m_pSaveFileInfo[1]); + swap(m_pRescanFileInfo[0], m_pRescanFileInfo[1]); + swap(m_nBufferType[0], m_nBufferType[1]); + swap(m_bEditAfterRescan[0], m_bEditAfterRescan[1]); m_strDesc[0].swap(m_strDesc[1]); m_filePaths.Swap(); - m_diffList.Swap(); m_ptBuf[0]->m_nThisPane = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-13 17:33:16
|
Revision: 7423 http://winmerge.svn.sourceforge.net/winmerge/?rev=7423&view=rev Author: gerundt Date: 2010-11-13 17:33:09 +0000 (Sat, 13 Nov 2010) Log Message: ----------- Move some string/char functions from StdAfx.cpp to new string_utils.cpp file. This allows using those functions from non-MFC code. Modified Paths: -------------- branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/MergeX64.vcproj branches/R2_14/Src/StdAfx.cpp branches/R2_14/Src/StdAfx.h branches/R2_14/Src/editlib/asp.cpp branches/R2_14/Src/editlib/basic.cpp branches/R2_14/Src/editlib/batch.cpp branches/R2_14/Src/editlib/ccrystaleditview.cpp branches/R2_14/Src/editlib/ccrystaltextview.cpp branches/R2_14/Src/editlib/ccrystaltextview2.cpp branches/R2_14/Src/editlib/cplusplus.cpp branches/R2_14/Src/editlib/csharp.cpp branches/R2_14/Src/editlib/css.cpp branches/R2_14/Src/editlib/dcl.cpp branches/R2_14/Src/editlib/fortran.cpp branches/R2_14/Src/editlib/html.cpp branches/R2_14/Src/editlib/ini.cpp branches/R2_14/Src/editlib/innosetup.cpp branches/R2_14/Src/editlib/is.cpp branches/R2_14/Src/editlib/java.cpp branches/R2_14/Src/editlib/lisp.cpp branches/R2_14/Src/editlib/nsis.cpp branches/R2_14/Src/editlib/pascal.cpp branches/R2_14/Src/editlib/perl.cpp branches/R2_14/Src/editlib/php.cpp branches/R2_14/Src/editlib/po.cpp branches/R2_14/Src/editlib/powershell.cpp branches/R2_14/Src/editlib/python.cpp branches/R2_14/Src/editlib/rexx.cpp branches/R2_14/Src/editlib/rsrc.cpp branches/R2_14/Src/editlib/ruby.cpp branches/R2_14/Src/editlib/sgml.cpp branches/R2_14/Src/editlib/sh.cpp branches/R2_14/Src/editlib/siod.cpp branches/R2_14/Src/editlib/sql.cpp branches/R2_14/Src/editlib/tcl.cpp branches/R2_14/Src/editlib/tex.cpp branches/R2_14/Src/editlib/verilog.cpp branches/R2_14/Src/editlib/xml.cpp branches/R2_14/Src/stringdiffs.cpp Added Paths: ----------- branches/R2_14/Src/Common/string_util.cpp branches/R2_14/Src/Common/string_util.h Added: branches/R2_14/Src/Common/string_util.cpp =================================================================== --- branches/R2_14/Src/Common/string_util.cpp (rev 0) +++ branches/R2_14/Src/Common/string_util.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -0,0 +1,61 @@ +/** + * @file string_util.cpp + * + * @brief Char classification routines implementations. + */ +// ID line follows -- this is updated by SVN +// $Id$ + +#include <windows.h> +#include <tchar.h> +#include "string_util.h" + +static wint_t normch(wint_t c); + +// Convert any negative inputs to negative char equivalents +// This is aimed at correcting any chars mistakenly +// sign-extended to negative ints. +// This is ok for the UNICODE build because UCS-2LE code bytes +// do not extend as high as 2Gig (actually even full Unicode +// codepoints don't extend that high). +static wint_t normch(wint_t c) +{ +#ifdef _UNICODE + return (unsigned short)(short)c; +#else + return (unsigned char)(char)c; +#endif +} + +/** @brief Return nonzero if input is outside ASCII or is underline. */ +int xisspecial(wint_t c) +{ + return normch(c) > (unsigned) _T('\x7f') || c == _T('_'); +} + +/** + * @brief Return non-zero if input is alphabetic or "special" (see xisspecial). + * Also converts any negative inputs to negative char equivalents (see normch). + */ +int xisalpha(wint_t c) +{ + return _istalpha(normch(c)) || xisspecial(normch(c)); +} + +/** + * @brief Return non-zero if input is alphanumeric or "special" (see xisspecial). + * Also converts any negative inputs to negative char equivalents (see normch). + */ +int xisalnum(wint_t c) +{ + return _istalnum(normch(c)) || xisspecial(normch(c)); +} + +/** + * @brief Return non-zero if input character is a space. + * Also converts any negative inputs to negative char equivalents (see normch). + */ +int xisspace(wint_t c) +{ + return _istspace(normch(c)); +} Property changes on: branches/R2_14/Src/Common/string_util.cpp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Src/Common/string_util.h =================================================================== --- branches/R2_14/Src/Common/string_util.h (rev 0) +++ branches/R2_14/Src/Common/string_util.h 2010-11-13 17:33:09 UTC (rev 7423) @@ -0,0 +1,18 @@ +/** + * @file string_util.h + * + * @brief Char classification routines declarations. + */ +// ID line follows -- this is updated by SVN +// $Id$ + +#ifndef _STRING_UTIL_H_ +#define _STRING_UTIL_H_ + +int xisalnum(wint_t c); +int xisspecial(wint_t c); +int xisalpha(wint_t c); +int xisalnum(wint_t c); +int xisspace(wint_t c); + +#endif // _STRING_UTIL_H_ Property changes on: branches/R2_14/Src/Common/string_util.h ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/Merge.vcproj 2010-11-13 17:33:09 UTC (rev 7423) @@ -3531,6 +3531,30 @@ </FileConfiguration> </File> <File + RelativePath="Common\string_util.cpp" + > + <FileConfiguration + Name="UnicodeRelease|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + <FileConfiguration + Name="UnicodeDebug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" + /> + </FileConfiguration> + </File> + <File RelativePath="stringdiffs.cpp" > <FileConfiguration Modified: branches/R2_14/Src/MergeX64.vcproj =================================================================== --- branches/R2_14/Src/MergeX64.vcproj 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/MergeX64.vcproj 2010-11-13 17:33:09 UTC (rev 7423) @@ -6330,6 +6330,44 @@ </FileConfiguration> </File> <File + RelativePath=".\Common\string_util.cpp" + > + <FileConfiguration + Name="UnicodeRelease|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </FileConfiguration> + <FileConfiguration + Name="UnicodeRelease|x64" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + /> + </FileConfiguration> + <FileConfiguration + Name="UnicodeDebug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + </FileConfiguration> + <FileConfiguration + Name="UnicodeDebug|x64" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + /> + </FileConfiguration> + </File> + <File RelativePath="stringdiffs.cpp" > <FileConfiguration Modified: branches/R2_14/Src/StdAfx.cpp =================================================================== --- branches/R2_14/Src/StdAfx.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/StdAfx.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -29,55 +29,8 @@ #include "LogFile.h" #include "Merge.h" -// Convert any negative inputs to negative char equivalents -// This is aimed at correcting any chars mistakenly -// sign-extended to negative ints. -// This is ok for the UNICODE build because UCS-2LE code bytes -// do not extend as high as 2Gig (actually even full Unicode -// codepoints don't extend that high). -static wint_t normch(wint_t c) -{ -#ifdef _UNICODE - return (unsigned short)(short)c; -#else - return (unsigned char)(char)c; -#endif -} -/** @brief Return nonzero if input is outside ASCII or is underline. */ -int xisspecial (wint_t c) -{ - return normch(c) > (unsigned) _T ('\x7f') || c == _T ('_'); -} - /** - * @brief Return non-zero if input is alphabetic or "special" (see xisspecial). - * Also converts any negative inputs to negative char equivalents (see normch). - */ -int xisalpha (wint_t c) -{ - return _istalpha (normch(c)) || xisspecial (normch(c)); -} - -/** - * @brief Return non-zero if input is alphanumeric or "special" (see xisspecial). - * Also converts any negative inputs to negative char equivalents (see normch). - */ -int xisalnum (wint_t c) -{ - return _istalnum (normch(c)) || xisspecial (normch(c)); -} - -/** - * @brief Return non-zero if input character is a space. - * Also converts any negative inputs to negative char equivalents (see normch). - */ -int xisspace (wint_t c) -{ - return _istspace (normch(c)); -} - -/** * @brief Load string resource and return as CString. * @param [in] id Resource string ID. * @return Resource string as CString. Modified: branches/R2_14/Src/StdAfx.h =================================================================== --- branches/R2_14/Src/StdAfx.h 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/StdAfx.h 2010-11-13 17:33:09 UTC (rev 7423) @@ -107,13 +107,6 @@ /// Seconds ignored in filetime differences if option enabled static const UINT SmallTimeDiff = 2; -// Miscellaneous functions defined in StdAfx.cpp - -int xisspecial (wint_t c); -int xisalpha (wint_t c); -int xisalnum (wint_t c); -int xisspace (wint_t c); - #include "UnicodeString.h" /** @brief Load string from string resources; shortcut for CString::LoadString */ Modified: branches/R2_14/Src/editlib/asp.cpp =================================================================== --- branches/R2_14/Src/editlib/asp.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/asp.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -17,6 +17,7 @@ #include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/basic.cpp =================================================================== --- branches/R2_14/Src/editlib/basic.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/basic.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/batch.cpp =================================================================== --- branches/R2_14/Src/editlib/batch.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/batch.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -17,6 +17,7 @@ #include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/ccrystaleditview.cpp =================================================================== --- branches/R2_14/Src/editlib/ccrystaleditview.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/ccrystaleditview.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -76,6 +76,7 @@ #include "registry.h" #include "cs2cs.h" #include "chcondlg.h" +#include "string_util.h" #ifndef __AFXPRIV_H__ #pragma message("Include <afxpriv.h> in your stdafx.h to avoid this message") Modified: branches/R2_14/Src/editlib/ccrystaltextview.cpp =================================================================== --- branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/ccrystaltextview.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -105,6 +105,7 @@ #include "SyntaxColors.h" #include "Ucs2Utf8.h" #include "unicoder.h" +#include "string_util.h" #include "pcre.h" // Escaped character constants in range 0x80-0xFF are interpreted in current codepage Modified: branches/R2_14/Src/editlib/ccrystaltextview2.cpp =================================================================== --- branches/R2_14/Src/editlib/ccrystaltextview2.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/ccrystaltextview2.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -49,6 +49,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include <malloc.h> +#include "string_util.h" #ifndef __AFXPRIV_H__ #pragma message("Include <afxpriv.h> in your stdafx.h to avoid this message") Modified: branches/R2_14/Src/editlib/cplusplus.cpp =================================================================== --- branches/R2_14/Src/editlib/cplusplus.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/cplusplus.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -29,6 +29,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/csharp.cpp =================================================================== --- branches/R2_14/Src/editlib/csharp.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/csharp.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -29,6 +29,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/css.cpp =================================================================== --- branches/R2_14/Src/editlib/css.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/css.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/dcl.cpp =================================================================== --- branches/R2_14/Src/editlib/dcl.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/dcl.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -17,6 +17,7 @@ #include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/fortran.cpp =================================================================== --- branches/R2_14/Src/editlib/fortran.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/fortran.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/html.cpp =================================================================== --- branches/R2_14/Src/editlib/html.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/html.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -17,6 +17,7 @@ #include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/ini.cpp =================================================================== --- branches/R2_14/Src/editlib/ini.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/ini.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -19,6 +19,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/innosetup.cpp =================================================================== --- branches/R2_14/Src/editlib/innosetup.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/innosetup.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/is.cpp =================================================================== --- branches/R2_14/Src/editlib/is.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/is.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -29,6 +29,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/java.cpp =================================================================== --- branches/R2_14/Src/editlib/java.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/java.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/lisp.cpp =================================================================== --- branches/R2_14/Src/editlib/lisp.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/lisp.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -17,6 +17,7 @@ #include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/nsis.cpp =================================================================== --- branches/R2_14/Src/editlib/nsis.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/nsis.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -29,6 +29,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/pascal.cpp =================================================================== --- branches/R2_14/Src/editlib/pascal.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/pascal.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/perl.cpp =================================================================== --- branches/R2_14/Src/editlib/perl.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/perl.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/php.cpp =================================================================== --- branches/R2_14/Src/editlib/php.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/php.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -17,6 +17,7 @@ #include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/po.cpp =================================================================== --- branches/R2_14/Src/editlib/po.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/po.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -19,6 +19,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/powershell.cpp =================================================================== --- branches/R2_14/Src/editlib/powershell.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/powershell.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/python.cpp =================================================================== --- branches/R2_14/Src/editlib/python.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/python.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/rexx.cpp =================================================================== --- branches/R2_14/Src/editlib/rexx.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/rexx.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/rsrc.cpp =================================================================== --- branches/R2_14/Src/editlib/rsrc.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/rsrc.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/ruby.cpp =================================================================== --- branches/R2_14/Src/editlib/ruby.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/ruby.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/sgml.cpp =================================================================== --- branches/R2_14/Src/editlib/sgml.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/sgml.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -17,6 +17,7 @@ #include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/sh.cpp =================================================================== --- branches/R2_14/Src/editlib/sh.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/sh.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/siod.cpp =================================================================== --- branches/R2_14/Src/editlib/siod.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/siod.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -17,6 +17,7 @@ #include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/sql.cpp =================================================================== --- branches/R2_14/Src/editlib/sql.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/sql.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/tcl.cpp =================================================================== --- branches/R2_14/Src/editlib/tcl.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/tcl.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/tex.cpp =================================================================== --- branches/R2_14/Src/editlib/tex.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/tex.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -17,6 +17,7 @@ #include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/verilog.cpp =================================================================== --- branches/R2_14/Src/editlib/verilog.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/verilog.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -18,6 +18,7 @@ #include "ccrystaltextview.h" #include "ccrystaltextbuffer.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/editlib/xml.cpp =================================================================== --- branches/R2_14/Src/editlib/xml.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/editlib/xml.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -17,6 +17,7 @@ #include "StdAfx.h" #include "ccrystaltextview.h" #include "SyntaxColors.h" +#include "string_util.h" #ifdef _DEBUG #define new DEBUG_NEW Modified: branches/R2_14/Src/stringdiffs.cpp =================================================================== --- branches/R2_14/Src/stringdiffs.cpp 2010-11-13 15:07:30 UTC (rev 7422) +++ branches/R2_14/Src/stringdiffs.cpp 2010-11-13 17:33:09 UTC (rev 7423) @@ -11,6 +11,7 @@ #include <vector> #include <mbctype.h> #include "UnicodeString.h" +#include "string_util.h" #include "stringdiffs.h" #include "CompareOptions.h" #include "stringdiffsi.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-15 13:25:55
|
Revision: 7424 http://winmerge.svn.sourceforge.net/winmerge/?rev=7424&view=rev Author: gerundt Date: 2010-11-15 13:25:49 +0000 (Mon, 15 Nov 2010) Log Message: ----------- Unify DIFFITEM method naming and remove unused method. Modified Paths: -------------- branches/R2_14/Src/7zCommon.cpp branches/R2_14/Src/DiffContext.cpp branches/R2_14/Src/DiffItem.cpp branches/R2_14/Src/DiffItem.h branches/R2_14/Src/DirView.cpp branches/R2_14/Src/DirViewColItems.cpp branches/R2_14/Src/MainFrm.cpp Modified: branches/R2_14/Src/7zCommon.cpp =================================================================== --- branches/R2_14/Src/7zCommon.cpp 2010-11-13 17:33:09 UTC (rev 7423) +++ branches/R2_14/Src/7zCommon.cpp 2010-11-15 13:25:49 UTC (rev 7424) @@ -905,8 +905,8 @@ envelope->FullPath = sFilename; envelope->FullPath.insert(0, _T("\\")); envelope->FullPath.insert(0, m_bRight ? - di.getRightFilepath(pDoc->GetRightBasePath()) : - di.getLeftFilepath(pDoc->GetLeftBasePath())); + di.GetRightFilepath(pDoc->GetRightBasePath()) : + di.GetLeftFilepath(pDoc->GetLeftBasePath())); UINT32 Recurse = item.Mask.Recurse; @@ -924,7 +924,7 @@ // Folder is not implied by some other file, and has // not been enumerated so far, so enumerate it now! envelope->Name = di.left.path; - envelope->FullPath = di.getLeftFilepath(pDoc->GetLeftBasePath()); + envelope->FullPath = di.GetLeftFilepath(pDoc->GetLeftBasePath()); implied = PVOID(2); // Don't enumerate same folder twice! isSideLeft = false; Recurse = 0; @@ -943,7 +943,7 @@ // Folder is not implied by some other file, and has // not been enumerated so far, so enumerate it now! envelope->Name = di.right.path; - envelope->FullPath = di.getRightFilepath(pDoc->GetRightBasePath()); + envelope->FullPath = di.GetRightFilepath(pDoc->GetRightBasePath()); implied = PVOID(2); // Don't enumerate same folder twice! isSideRight = false; Recurse = 0; @@ -1099,7 +1099,7 @@ { cchBuffer += ( - m_bRight ? di.getRightFilepath(sLeftRootPath) : di.getLeftFilepath(sRightRootPath) + m_bRight ? di.GetRightFilepath(sLeftRootPath) : di.GetLeftFilepath(sRightRootPath) ).length() + (m_bRight ? di.right.filename : di.left.filename).length() + 2; } } @@ -1113,7 +1113,7 @@ ( pchBuffer, _T("%s\\%s"), - m_bRight ? di.getRightFilepath(sLeftRootPath).c_str() : di.getLeftFilepath(sRightRootPath).c_str(), + m_bRight ? di.GetRightFilepath(sLeftRootPath).c_str() : di.GetLeftFilepath(sRightRootPath).c_str(), m_bRight ? di.right.filename.c_str() : di.left.filename.c_str() ) + 1; } Modified: branches/R2_14/Src/DiffContext.cpp =================================================================== --- branches/R2_14/Src/DiffContext.cpp 2010-11-13 17:33:09 UTC (rev 7423) +++ branches/R2_14/Src/DiffContext.cpp 2010-11-15 13:25:49 UTC (rev 7424) @@ -125,9 +125,9 @@ String filepath; if (bLeft == TRUE) - filepath = paths_ConcatPath(di.getLeftFilepath(GetNormalizedLeft()), di.left.filename); + filepath = paths_ConcatPath(di.GetLeftFilepath(GetNormalizedLeft()), di.left.filename); else - filepath = paths_ConcatPath(di.getRightFilepath(GetNormalizedRight()), di.right.filename); + filepath = paths_ConcatPath(di.GetRightFilepath(GetNormalizedRight()), di.right.filename); DiffFileInfo & dfi = bLeft ? di.left : di.right; if (!dfi.Update(filepath.c_str())) @@ -185,7 +185,7 @@ LPCTSTR ext = PathFindExtension(di.left.filename.c_str()); if (!CheckFileForVersion(ext)) return; - spath = di.getLeftFilepath(GetNormalizedLeft()); + spath = di.GetLeftFilepath(GetNormalizedLeft()); spath = paths_ConcatPath(spath, di.left.filename); } else @@ -195,7 +195,7 @@ LPCTSTR ext = PathFindExtension(di.right.filename.c_str()); if (!CheckFileForVersion(ext)) return; - spath = di.getRightFilepath(GetNormalizedRight()); + spath = di.GetRightFilepath(GetNormalizedRight()); spath = paths_ConcatPath(spath, di.right.filename); } Modified: branches/R2_14/Src/DiffItem.cpp =================================================================== --- branches/R2_14/Src/DiffItem.cpp 2010-11-13 17:33:09 UTC (rev 7423) +++ branches/R2_14/Src/DiffItem.cpp 2010-11-15 13:25:49 UTC (rev 7424) @@ -30,7 +30,7 @@ } /** @brief Return path to left file, including all but file name */ -String DIFFITEM::getLeftFilepath(const String &sLeftRoot) const +String DIFFITEM::GetLeftFilepath(const String &sLeftRoot) const { String sPath; if (!diffcode.isSideRightOnly()) @@ -41,7 +41,7 @@ } /** @brief Return path to right file, including all but file name */ -String DIFFITEM::getRightFilepath(const String &sRightRoot) const +String DIFFITEM::GetRightFilepath(const String &sRightRoot) const { String sPath; if (!diffcode.isSideLeftOnly()) Modified: branches/R2_14/Src/DiffItem.h =================================================================== --- branches/R2_14/Src/DiffItem.h 2010-11-13 17:33:09 UTC (rev 7423) +++ branches/R2_14/Src/DiffItem.h 2010-11-15 13:25:49 UTC (rev 7424) @@ -144,9 +144,8 @@ DIFFITEM() : parent(NULL), nidiffs(-1), nsdiffs(-1), customFlags1(0) { } ~DIFFITEM(); - bool isEmpty() const { return this == &emptyitem; } - String getLeftFilepath(const String &sLeftRoot) const; - String getRightFilepath(const String &sRightRoot) const; + String GetLeftFilepath(const String &sLeftRoot) const; + String GetRightFilepath(const String &sRightRoot) const; int GetDepth() const; bool IsAncestor(const DIFFITEM *pdi) const; bool HasChildren() const; Modified: branches/R2_14/Src/DirView.cpp =================================================================== --- branches/R2_14/Src/DirView.cpp 2010-11-13 17:33:09 UTC (rev 7423) +++ branches/R2_14/Src/DirView.cpp 2010-11-15 13:25:49 UTC (rev 7424) @@ -731,9 +731,9 @@ !di.diffcode.isSideLeftOnly() && !di.diffcode.isSideRightOnly() && !di.diffcode.isResultFiltered()) { - String leftPath = di.getLeftFilepath(pDoc->GetLeftBasePath()) + + String leftPath = di.GetLeftFilepath(pDoc->GetLeftBasePath()) + _T("\\") + di.left.filename; - String rightPath = di.getRightFilepath(pDoc->GetRightBasePath()) + + String rightPath = di.GetRightFilepath(pDoc->GetRightBasePath()) + _T("\\") + di.right.filename; CString filteredFilenames; filteredFilenames.Format(_T("%s|%s"), leftPath.c_str(), rightPath.c_str()); @@ -820,8 +820,8 @@ continue; String currentDir = (side == SIDE_LEFT) ? - di.getLeftFilepath(pDoc->GetLeftBasePath()) : - di.getRightFilepath(pDoc->GetRightBasePath()); + di.GetLeftFilepath(pDoc->GetLeftBasePath()) : + di.GetRightFilepath(pDoc->GetRightBasePath()); String filename = ((side == SIDE_LEFT) ? di.left.filename : di.right.filename); @@ -3090,7 +3090,7 @@ const DIFFITEM& di = GetDiffItem(sel); if (!di.diffcode.isSideRightOnly()) { - strPaths += di.getLeftFilepath(GetDocument()->GetLeftBasePath()); + strPaths += di.GetLeftFilepath(GetDocument()->GetLeftBasePath()); strPaths += _T("\\"); // If item is a folder then subfolder (relative to base folder) // is in filename member. @@ -3115,7 +3115,7 @@ const DIFFITEM& di = GetDiffItem(sel); if (!di.diffcode.isSideLeftOnly()) { - strPaths += di. getRightFilepath(pDoc->GetRightBasePath()); + strPaths += di.GetRightFilepath(pDoc->GetRightBasePath()); strPaths += _T("\\"); // If item is a folder then subfolder (relative to base folder) // is in filename member. @@ -3140,7 +3140,7 @@ const DIFFITEM& di = GetDiffItem(sel); if (!di.diffcode.isSideRightOnly()) { - strPaths += di.getLeftFilepath(pDoc->GetLeftBasePath()); + strPaths += di.GetLeftFilepath(pDoc->GetLeftBasePath()); strPaths += _T("\\"); // If item is a folder then subfolder (relative to base folder) // is in filename member. @@ -3150,7 +3150,7 @@ if (!di.diffcode.isSideLeftOnly()) { - strPaths += di. getRightFilepath(pDoc->GetRightBasePath()); + strPaths += di.GetRightFilepath(pDoc->GetRightBasePath()); strPaths += _T("\\"); // If item is a folder then subfolder (relative to base folder) // is in filename member. Modified: branches/R2_14/Src/DirViewColItems.cpp =================================================================== --- branches/R2_14/Src/DirViewColItems.cpp 2010-11-13 17:33:09 UTC (rev 7423) +++ branches/R2_14/Src/DirViewColItems.cpp 2010-11-15 13:25:49 UTC (rev 7424) @@ -277,12 +277,12 @@ else if (di.diffcode.isSideLeftOnly()) { s = theApp.LoadString(IDS_LEFT_ONLY_IN_FMT); - string_replace(s, _T("%1"), di.getLeftFilepath(pCtxt->GetNormalizedLeft()).c_str()); + string_replace(s, _T("%1"), di.GetLeftFilepath(pCtxt->GetNormalizedLeft()).c_str()); } else if (di.diffcode.isSideRightOnly()) { s = theApp.LoadString(IDS_RIGHT_ONLY_IN_FMT); - string_replace(s, _T("%1"), di.getRightFilepath(pCtxt->GetNormalizedRight()).c_str()); + string_replace(s, _T("%1"), di.GetRightFilepath(pCtxt->GetNormalizedRight()).c_str()); } else if (di.diffcode.isResultSame()) { Modified: branches/R2_14/Src/MainFrm.cpp =================================================================== --- branches/R2_14/Src/MainFrm.cpp 2010-11-13 17:33:09 UTC (rev 7423) +++ branches/R2_14/Src/MainFrm.cpp 2010-11-15 13:25:49 UTC (rev 7424) @@ -2078,10 +2078,10 @@ if (bValidFiles) { // Format full paths to files (leftFile/rightFile) - String leftFile = item.getLeftFilepath(pDoc->GetLeftBasePath()); + String leftFile = item.GetLeftFilepath(pDoc->GetLeftBasePath()); if (!leftFile.empty()) leftFile += _T("\\") + item.left.filename; - String rightFile = item.getRightFilepath(pDoc->GetRightBasePath()); + String rightFile = item.GetRightFilepath(pDoc->GetRightBasePath()); if (!rightFile.empty()) rightFile += _T("\\") + item.right.filename; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-15 13:32:43
|
Revision: 7425 http://winmerge.svn.sourceforge.net/winmerge/?rev=7425&view=rev Author: gerundt Date: 2010-11-15 13:32:36 +0000 (Mon, 15 Nov 2010) Log Message: ----------- Remove MFC dependency from DiffItem. Modified Paths: -------------- branches/R2_14/Src/DiffItem.cpp branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/MergeX64.vcproj Modified: branches/R2_14/Src/DiffItem.cpp =================================================================== --- branches/R2_14/Src/DiffItem.cpp 2010-11-15 13:25:49 UTC (rev 7424) +++ branches/R2_14/Src/DiffItem.cpp 2010-11-15 13:32:36 UTC (rev 7425) @@ -6,16 +6,10 @@ // ID line follows -- this is updated by SVN // $Id$ -#include "stdafx.h" +#include <windows.h> #include "DiffItem.h" #include "paths.h" -#ifdef _DEBUG -#undef THIS_FILE -static char THIS_FILE[]=__FILE__; -#define new DEBUG_NEW -#endif - DIFFITEM DIFFITEM::emptyitem; /** @brief DIFFITEM's destructor */ Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-11-15 13:25:49 UTC (rev 7424) +++ branches/R2_14/Src/Merge.vcproj 2010-11-15 13:32:36 UTC (rev 7425) @@ -869,6 +869,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -879,6 +882,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> Modified: branches/R2_14/Src/MergeX64.vcproj =================================================================== --- branches/R2_14/Src/MergeX64.vcproj 2010-11-15 13:25:49 UTC (rev 7424) +++ branches/R2_14/Src/MergeX64.vcproj 2010-11-15 13:32:36 UTC (rev 7425) @@ -1558,6 +1558,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" /> </FileConfiguration> <FileConfiguration @@ -1568,6 +1569,8 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" /> </FileConfiguration> <FileConfiguration @@ -1578,6 +1581,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" BrowseInformation="1" /> </FileConfiguration> @@ -1589,6 +1593,8 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" BrowseInformation="1" /> </FileConfiguration> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-16 13:20:57
|
Revision: 7426 http://winmerge.svn.sourceforge.net/winmerge/?rev=7426&view=rev Author: gerundt Date: 2010-11-16 13:20:50 +0000 (Tue, 16 Nov 2010) Log Message: ----------- Remove MFC dependency from ByteComparator class. Modified Paths: -------------- branches/R2_14/Src/CompareEngines/ByteComparator.cpp branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/MergeX64.vcproj Modified: branches/R2_14/Src/CompareEngines/ByteComparator.cpp =================================================================== --- branches/R2_14/Src/CompareEngines/ByteComparator.cpp 2010-11-15 13:32:36 UTC (rev 7425) +++ branches/R2_14/Src/CompareEngines/ByteComparator.cpp 2010-11-16 13:20:50 UTC (rev 7426) @@ -6,7 +6,10 @@ // ID line follows -- this is updated by SVN // $Id$ -#include "StdAfx.h" +//#include "StdAfx.h" +#include <windows.h> +#include <tchar.h> +#include <assert.h> #include "ByteComparator.h" #include "FileTextStats.h" #include "CompareOptions.h" @@ -259,7 +262,7 @@ // "whitespace on both sides" // should not come here, it should have been // handled above - ASSERT(!iswsch(*ptr0)); + assert(!iswsch(*ptr0)); if (iseolch(*ptr0)) { Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-11-15 13:32:36 UTC (rev 7425) +++ branches/R2_14/Src/Merge.vcproj 2010-11-16 13:20:50 UTC (rev 7426) @@ -6678,6 +6678,9 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" /> </FileConfiguration> <FileConfiguration @@ -6688,6 +6691,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1" /> </FileConfiguration> Modified: branches/R2_14/Src/MergeX64.vcproj =================================================================== --- branches/R2_14/Src/MergeX64.vcproj 2010-11-15 13:32:36 UTC (rev 7425) +++ branches/R2_14/Src/MergeX64.vcproj 2010-11-16 13:20:50 UTC (rev 7426) @@ -11243,6 +11243,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" /> </FileConfiguration> <FileConfiguration @@ -11253,6 +11254,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" /> </FileConfiguration> <FileConfiguration @@ -11263,6 +11265,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" BrowseInformation="1" /> </FileConfiguration> @@ -11274,6 +11277,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" BrowseInformation="1" /> </FileConfiguration> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-16 14:27:40
|
Revision: 7428 http://winmerge.svn.sourceforge.net/winmerge/?rev=7428&view=rev Author: gerundt Date: 2010-11-16 14:27:33 +0000 (Tue, 16 Nov 2010) Log Message: ----------- PATCH: [ 2805717 ] Refactor Date/Size compare to own compare engine Modified Paths: -------------- branches/R2_14/Src/FolderCmp.cpp branches/R2_14/Src/FolderCmp.h branches/R2_14/Src/Merge.vcproj branches/R2_14/Src/MergeX64.vcproj Added Paths: ----------- branches/R2_14/Src/CompareEngines/TimeSizeCompare.cpp branches/R2_14/Src/CompareEngines/TimeSizeCompare.h Added: branches/R2_14/Src/CompareEngines/TimeSizeCompare.cpp =================================================================== --- branches/R2_14/Src/CompareEngines/TimeSizeCompare.cpp (rev 0) +++ branches/R2_14/Src/CompareEngines/TimeSizeCompare.cpp 2010-11-16 14:27:33 UTC (rev 7428) @@ -0,0 +1,87 @@ +/** + * @file TimeSizeCompare.cpp + * + * @brief Implementation file for TimeSizeCompare + */ +// ID line follows -- this is updated by SVN +// $Id$ + +#include "stdafx.h" +#include "DiffItem.h" +#include "TimeSizeCompare.h" +#include "DiffWrapper.h" + +namespace CompareEngines +{ + +TimeSizeCompare::TimeSizeCompare() + : m_ignoreSmallDiff(false) +{ +} + +TimeSizeCompare::~TimeSizeCompare() +{ +} + +/** + * @brief Set compare-type specific options. + * @param [in] ignoreSmallDiff Ignore small time differences? + */ +void TimeSizeCompare::SetAdditionalOptions(bool ignoreSmallDiff) +{ + m_ignoreSmallDiff = ignoreSmallDiff; +} + +/** + * @brief Compare two specified files, byte-by-byte + * @param [in] compMethod Compare method used. + * @param [in] di Diffitem info. + * @return DIFFCODE + */ +int TimeSizeCompare::CompareFiles(int compMethod, const DIFFITEM &di) +{ + UINT code = 0; + + // Compare by modified date + // Check that we have both filetimes + if (di.left.mtime != 0 && di.right.mtime != 0) + { + INT64 nTimeDiff = di.left.mtime - di.right.mtime; + // Remove sign + nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff); + if (m_ignoreSmallDiff) + { + // If option to ignore small timediffs (couple of seconds) + // is set, decrease absolute difference by allowed diff + nTimeDiff -= SmallTimeDiff; + } + if (nTimeDiff <= 0) + code = DIFFCODE::SAME; + else + code = DIFFCODE::DIFF; + } + else + { + // Filetimes for item(s) could not be read. So we have to + // set error status, unless we have DATE_SIZE -compare + // when we have still hope for size compare.. + if (compMethod == CMP_DATE_SIZE) + code = DIFFCODE::SAME; + else + code = DIFFCODE::CMPERR; + } + + // This is actual CMP_DATE_SIZE method.. + // If file sizes differ mark them different + if (compMethod == CMP_DATE_SIZE) + { + if (di.left.size != di.right.size) + { + code &= ~DIFFCODE::SAME; + code = DIFFCODE::DIFF; + } + } + return code; +} + +} // namespace CompareEngines Property changes on: branches/R2_14/Src/CompareEngines/TimeSizeCompare.cpp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/R2_14/Src/CompareEngines/TimeSizeCompare.h =================================================================== --- branches/R2_14/Src/CompareEngines/TimeSizeCompare.h (rev 0) +++ branches/R2_14/Src/CompareEngines/TimeSizeCompare.h 2010-11-16 14:27:33 UTC (rev 7428) @@ -0,0 +1,33 @@ +/** + * @file TimeSizeCompare.h + * + * @brief Declaration file for TimeSizeCompare compare engine. + */ +// ID line follows -- this is updated by SVN +// $Id$ + +#ifndef _TIMESIZE_COMPARE_H_ +#define _TIMESIZE_COMPARE_H_ + +namespace CompareEngines +{ + +/** + * @brief A time/size compare class. + * This compare method compares files by their times and sizes. + */ +class TimeSizeCompare +{ +public: + TimeSizeCompare(); + ~TimeSizeCompare(); + void SetAdditionalOptions(bool ignoreSmallDiff); + int CompareFiles(int compMethod, const DIFFITEM &di); + +private: + bool m_ignoreSmallDiff; +}; + +} // namespace CompareEngines + +#endif // _TIMESIZE_COMPARE_H_ Property changes on: branches/R2_14/Src/CompareEngines/TimeSizeCompare.h ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/R2_14/Src/FolderCmp.cpp =================================================================== --- branches/R2_14/Src/FolderCmp.cpp 2010-11-16 13:31:14 UTC (rev 7427) +++ branches/R2_14/Src/FolderCmp.cpp 2010-11-16 14:27:33 UTC (rev 7428) @@ -21,8 +21,10 @@ #include "FolderCmp.h" #include "ByteComparator.h" #include "codepage_detect.h" +#include "TimeSizeCompare.h" using CompareEngines::ByteCompare; +using CompareEngines::TimeSizeCompare; static void GetComparePaths(CDiffContext * pCtxt, const DIFFITEM &di, String & left, String & right); static bool Unpack(String & filepathTransformed, @@ -31,6 +33,7 @@ FolderCmp::FolderCmp() : m_pDiffUtilsEngine(NULL) , m_pByteCompare(NULL) +, m_pTimeSizeCompare(NULL) , m_ndiffs(CDiffContext::DIFFS_UNKNOWN) , m_ntrivialdiffs(CDiffContext::DIFFS_UNKNOWN) { @@ -40,6 +43,7 @@ { delete m_pDiffUtilsEngine; delete m_pByteCompare; + delete m_pTimeSizeCompare; } bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CString &errStr) @@ -276,57 +280,15 @@ di.left.m_textStats = m_diffFileData.m_textStats0; di.right.m_textStats = m_diffFileData.m_textStats1; } - else if (pCtxt->m_nCompMethod == CMP_DATE || - pCtxt->m_nCompMethod == CMP_DATE_SIZE) + else if (nCompMethod == CMP_DATE || nCompMethod == CMP_DATE_SIZE || nCompMethod == CMP_SIZE) { - // Compare by modified date - // Check that we have both filetimes - if (di.left.mtime != 0 && di.right.mtime != 0) - { - __int64 nTimeDiff = di.left.mtime - di.right.mtime; - // Remove sign - nTimeDiff = (nTimeDiff > 0 ? nTimeDiff : -nTimeDiff); - if (pCtxt->m_bIgnoreSmallTimeDiff) - { - // If option to ignore small timediffs (couple of seconds) - // is set, decrease absolute difference by allowed diff - nTimeDiff -= SmallTimeDiff; - } - if (nTimeDiff <= 0) - code = DIFFCODE::SAME; - else - code = DIFFCODE::DIFF; - } - else - { - // Filetimes for item(s) could not be read. So we have to - // set error status, unless we have DATE_SIZE -compare - // when we have still hope for size compare.. - if (pCtxt->m_nCompMethod == CMP_DATE_SIZE) - code = DIFFCODE::SAME; - else - code = DIFFCODE::CMPERR; - } - - // This is actual CMP_DATE_SIZE method.. - // If file sizes differ mark them different - if (pCtxt->m_nCompMethod == CMP_DATE_SIZE) - { - if (di.left.size != di.right.size) - { - code &= ~DIFFCODE::SAME; - code = DIFFCODE::DIFF; - } - } + if (m_pTimeSizeCompare == NULL) + m_pTimeSizeCompare = new TimeSizeCompare(); + + m_pTimeSizeCompare->SetAdditionalOptions(!!pCtxt->m_bIgnoreSmallTimeDiff); + code = m_pTimeSizeCompare->CompareFiles(nCompMethod, di); + } - else if (pCtxt->m_nCompMethod == CMP_SIZE) - { - // Compare by size - if (di.left.size == di.right.size) - code = DIFFCODE::SAME; - else - code = DIFFCODE::DIFF; - } else { // Print error since we should have handled by date compare earlier Modified: branches/R2_14/Src/FolderCmp.h =================================================================== --- branches/R2_14/Src/FolderCmp.h 2010-11-16 13:31:14 UTC (rev 7427) +++ branches/R2_14/Src/FolderCmp.h 2010-11-16 14:27:33 UTC (rev 7428) @@ -12,6 +12,7 @@ #include "DiffFileData.h" #include "DiffUtils.h" #include "ByteCompare.h" +#include "TimeSizeCompare.h" class CDiffContext; class PackingInfo; @@ -56,6 +57,7 @@ private: CompareEngines::DiffUtils *m_pDiffUtilsEngine; CompareEngines::ByteCompare *m_pByteCompare; + CompareEngines::TimeSizeCompare *m_pTimeSizeCompare; }; Modified: branches/R2_14/Src/Merge.vcproj =================================================================== --- branches/R2_14/Src/Merge.vcproj 2010-11-16 13:31:14 UTC (rev 7427) +++ branches/R2_14/Src/Merge.vcproj 2010-11-16 14:27:33 UTC (rev 7428) @@ -6760,6 +6760,35 @@ RelativePath="CompareEngines\DiffUtils.h" > </File> + <File + RelativePath="CompareEngines\TimeSizeCompare.cpp" + > + <FileConfiguration + Name="UnicodeRelease|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="UnicodeDebug|Win32" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BrowseInformation="1" + /> + </FileConfiguration> + </File> + <File + RelativePath="CompareEngines\TimeSizeCompare.h" + > + </File> </Filter> <Filter Name="Batch files" Modified: branches/R2_14/Src/MergeX64.vcproj =================================================================== --- branches/R2_14/Src/MergeX64.vcproj 2010-11-16 13:31:14 UTC (rev 7427) +++ branches/R2_14/Src/MergeX64.vcproj 2010-11-16 14:27:33 UTC (rev 7428) @@ -11386,6 +11386,14 @@ RelativePath="CompareEngines\DiffUtils.h" > </File> + <File + RelativePath=".\CompareEngines\TimeSizeCompare.cpp" + > + </File> + <File + RelativePath=".\CompareEngines\TimeSizeCompare.h" + > + </File> </Filter> </Files> <Globals> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-17 13:42:22
|
Revision: 7430 http://winmerge.svn.sourceforge.net/winmerge/?rev=7430&view=rev Author: gerundt Date: 2010-11-17 13:42:16 +0000 (Wed, 17 Nov 2010) Log Message: ----------- Move FFILEOPEN_* flags to Constants.h so they are available in non-MFC code. Also they aren't property of CMainFrame. Modified Paths: -------------- branches/R2_14/Src/Constants.h branches/R2_14/Src/DirView.cpp branches/R2_14/Src/MainFrm.h branches/R2_14/Src/MergeCmdLineInfo.cpp Modified: branches/R2_14/Src/Constants.h =================================================================== --- branches/R2_14/Src/Constants.h 2010-11-16 14:34:03 UTC (rev 7429) +++ branches/R2_14/Src/Constants.h 2010-11-17 13:42:16 UTC (rev 7430) @@ -50,4 +50,17 @@ */ const TCHAR DefaultRelativeFilterPath[] = _T("WinMerge\\Filters"); +/** + * @brief Flags used when opening files + */ +enum +{ + FFILEOPEN_NONE = 0x0000, + FFILEOPEN_NOMRU = 0x0001, /**< Do not add this path to MRU list */ + FFILEOPEN_READONLY = 0x0002, /**< Open this path as read-only */ + FFILEOPEN_MODIFIED = 0x0004, /**< Mark file modified after opening. */ + FFILEOPEN_CMDLINE = 0x0010, /**< Path is read from commandline */ + FFILEOPEN_PROJECT = 0x0020, /**< Path is read from project-file */ +}; + #endif // _CONSTANTS_H_ Modified: branches/R2_14/Src/DirView.cpp =================================================================== --- branches/R2_14/Src/DirView.cpp 2010-11-16 14:34:03 UTC (rev 7429) +++ branches/R2_14/Src/DirView.cpp 2010-11-17 13:42:16 UTC (rev 7430) @@ -27,6 +27,7 @@ // $Id$ #include "StdAfx.h" +#include "Constants.h" #include "Merge.h" #include "ClipBoard.h" #include "DirView.h" Modified: branches/R2_14/Src/MainFrm.h =================================================================== --- branches/R2_14/Src/MainFrm.h 2010-11-16 14:34:03 UTC (rev 7429) +++ branches/R2_14/Src/MainFrm.h 2010-11-17 13:42:16 UTC (rev 7430) @@ -37,19 +37,6 @@ #include "MergeCmdLineInfo.h" /** - * @brief Flags used when opening files - */ -enum -{ - FFILEOPEN_NONE = 0x0000, - FFILEOPEN_NOMRU = 0x0001, /**< Do not add this path to MRU list */ - FFILEOPEN_READONLY = 0x0002, /**< Open this path as read-only */ - FFILEOPEN_MODIFIED = 0x0004, /**< Mark file modified after opening. */ - FFILEOPEN_CMDLINE = 0x0010, /**< Path is read from commandline */ - FFILEOPEN_PROJECT = 0x0020, /**< Path is read from project-file */ -}; - -/** * @brief Supported versioncontrol systems. */ enum Modified: branches/R2_14/Src/MergeCmdLineInfo.cpp =================================================================== --- branches/R2_14/Src/MergeCmdLineInfo.cpp 2010-11-16 14:34:03 UTC (rev 7429) +++ branches/R2_14/Src/MergeCmdLineInfo.cpp 2010-11-17 13:42:16 UTC (rev 7430) @@ -33,6 +33,7 @@ #include <shlwapi.h> // Required for PathFindFileName +#include "Constants.h" #include "Paths.h" #include "Merge.h" #include "MainFrm.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-18 13:52:42
|
Revision: 7431 http://winmerge.svn.sourceforge.net/winmerge/?rev=7431&view=rev Author: gerundt Date: 2010-11-18 13:52:36 +0000 (Thu, 18 Nov 2010) Log Message: ----------- Catch out of memory error when converting byte array to string. Modified Paths: -------------- branches/R2_14/Src/Common/UniFile.cpp branches/R2_14/Src/Common/unicoder.cpp branches/R2_14/Src/Common/unicoder.h branches/R2_14/Src/UniMarkdownFile.cpp Modified: branches/R2_14/Src/Common/UniFile.cpp =================================================================== --- branches/R2_14/Src/Common/UniFile.cpp 2010-11-17 13:42:16 UTC (rev 7430) +++ branches/R2_14/Src/Common/UniFile.cpp 2010-11-18 13:52:36 UTC (rev 7431) @@ -456,7 +456,7 @@ * @param [out] line Line read. * @param [out] eol EOL bytes read (if any). * @param [out] lossy TRUE if there were lossy encoding. - * @return TRUE if there is more lines to read, TRUE when last line is read. + * @return true if there is more lines to read, false when last line is read. */ bool UniMemFile::ReadString(String & line, String & eol, bool * lossy) { @@ -581,7 +581,11 @@ RecordZero(m_txtstats, offset); } } - line = ucr::maketstring((LPCSTR)m_current, eolptr - m_current, m_codepage, lossy); + bool success = ucr::maketstring(line, (LPCSTR)m_current, eolptr - m_current, m_codepage, lossy); + if (!success) + { + return false; + } if (lossy && *lossy) ++m_txtstats.nlosses; if (!eof) Modified: branches/R2_14/Src/Common/unicoder.cpp =================================================================== --- branches/R2_14/Src/Common/unicoder.cpp 2010-11-17 13:42:16 UTC (rev 7430) +++ branches/R2_14/Src/Common/unicoder.cpp 2010-11-18 13:52:36 UTC (rev 7431) @@ -463,18 +463,27 @@ } /** - * @brief Convert series of bytes (8-bit chars) to TCHARs, using specified codepage + * @brief Convert series of bytes (8-bit chars) to TCHARs. * - * TODO: This doesn't inform the caller whether translation was lossy + * @param [out] str String returned. + * @param [in] lpd Original byte array to convert. + * @param [in] len Length of the original byte array. + * @param [in] codepage Codepage used. + * @param [out] lossy Was conversion lossy? + * @return true if conversion succeeds, false otherwise. + * @todo This doesn't inform the caller whether translation was lossy * In fact, this doesn't even know. Probably going to have to make * two passes, the first with MB_ERR_INVALID_CHARS. Ugh. :( */ -String maketstring(const char* lpd, unsigned int len, int codepage, bool * lossy) +bool maketstring(String & str, const char* lpd, unsigned int len, int codepage, bool * lossy) { int defcodepage = getDefaultCodepage(); if (!len) - return _T(""); + { + str.clear(); + return true; + } // 0 is a valid value (CP_ACP)! if (codepage == -1) @@ -485,8 +494,17 @@ // TCHAR is wchar_t, so convert into String (str) DWORD flags = MB_ERR_INVALID_CHARS; int wlen = len * 2 + 6; - String str; - str.resize(wlen); + + try + { + str.resize(wlen); + } + catch (std::bad_alloc) + { + // Not enough memory - exit + return false; + } + LPWSTR wbuff = &*str.begin(); do { @@ -508,26 +526,35 @@ ASSERT(FALSE); --n; } - str.resize(n); - return str; + try + { + str.resize(n); + } + catch (std::bad_alloc) + { + // Not enough memory - exit + return false; + } + return true; } *lossy = true; flags ^= MB_ERR_INVALID_CHARS; } while (flags == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION); str = _T('?'); - return str; + return true; #else if (EqualCodepages(codepage, defcodepage)) { // trivial case, they want the bytes in the file interpreted in our current codepage // Only caveat is that input (lpd) is not zero-terminated - return String(lpd, len); + str = String(lpd, len); + return true; } - String str = CrossConvertToStringA(lpd, len, codepage, defcodepage, lossy); - return str; + str = CrossConvertToStringA(lpd, len, codepage, defcodepage, lossy); + return true; #endif } Modified: branches/R2_14/Src/Common/unicoder.h =================================================================== --- branches/R2_14/Src/Common/unicoder.h 2010-11-17 13:42:16 UTC (rev 7430) +++ branches/R2_14/Src/Common/unicoder.h 2010-11-18 13:52:36 UTC (rev 7431) @@ -50,7 +50,7 @@ String maketchar(unsigned int ch, bool & lossy); int writeBom(void* dest, UNICODESET unicoding); unsigned int get_unicode_char(unsigned char * ptr, UNICODESET unicoding, int codepage = 0); -String maketstring(const char* lpd, unsigned int len, int codepage, bool * lossy); +bool maketstring(String & str, const char* lpd, unsigned int len, int codepage, bool * lossy); String maketchar(unsigned int unich, bool & lossy); String maketchar(unsigned int unich, bool & lossy, unsigned int codepage); unsigned int byteToUnicode(unsigned char ch); Modified: branches/R2_14/Src/UniMarkdownFile.cpp =================================================================== --- branches/R2_14/Src/UniMarkdownFile.cpp 2010-11-17 13:42:16 UTC (rev 7430) +++ branches/R2_14/Src/UniMarkdownFile.cpp 2010-11-18 13:52:36 UTC (rev 7431) @@ -138,7 +138,8 @@ String UniMarkdownFile::maketstring(LPCSTR lpd, UINT len) { bool lossy = false; - String s = ucr::maketstring(lpd, len, m_codepage, &lossy); + String s; + ucr::maketstring(s, lpd, len, m_codepage, &lossy); if (lossy) ++m_txtstats.nlosses; return s; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-11-18 14:16:14
|
Revision: 7432 http://winmerge.svn.sourceforge.net/winmerge/?rev=7432&view=rev Author: gerundt Date: 2010-11-18 14:16:08 +0000 (Thu, 18 Nov 2010) Log Message: ----------- PATCH: [ 3014162 ] Fix LineFilters wasting enormous amounts of memory Modified Paths: -------------- branches/R2_14/Src/Common/coretools.cpp branches/R2_14/Src/Common/coretools.h branches/R2_14/Src/CompareEngines/DiffUtils.cpp branches/R2_14/Src/DiffWrapper.cpp branches/R2_14/Src/FileFilterHelper.cpp branches/R2_14/Src/FilterList.cpp branches/R2_14/Src/FilterList.h Modified: branches/R2_14/Src/Common/coretools.cpp =================================================================== --- branches/R2_14/Src/Common/coretools.cpp 2010-11-18 13:52:36 UTC (rev 7431) +++ branches/R2_14/Src/Common/coretools.cpp 2010-11-18 14:16:08 UTC (rev 7432) @@ -91,6 +91,17 @@ return cnt; } +size_t linelen(const char *string) +{ + size_t stringlen = 0; + while (char c = string[stringlen]) + { + if (c == '\r' || c == '\n') + break; + ++stringlen; + } + return stringlen; +} void GetLocalDrives(LPTSTR letters) { Modified: branches/R2_14/Src/Common/coretools.h =================================================================== --- branches/R2_14/Src/Common/coretools.h 2010-11-18 13:52:36 UTC (rev 7431) +++ branches/R2_14/Src/Common/coretools.h 2010-11-18 14:16:08 UTC (rev 7432) @@ -105,6 +105,7 @@ String LegalizeFileName(LPCTSTR szFileName); int tcssubptr(LPCTSTR start, LPCTSTR end); +size_t linelen(const char *string); HANDLE RunIt(LPCTSTR szExeFile, LPCTSTR szArgs, BOOL bMinimized = TRUE, BOOL bNewConsole = FALSE); BOOL HasExited(HANDLE hProcess, DWORD *pCode = NULL); Modified: branches/R2_14/Src/CompareEngines/DiffUtils.cpp =================================================================== --- branches/R2_14/Src/CompareEngines/DiffUtils.cpp 2010-11-18 13:52:36 UTC (rev 7431) +++ branches/R2_14/Src/CompareEngines/DiffUtils.cpp 2010-11-18 14:16:08 UTC (rev 7432) @@ -13,6 +13,7 @@ #include "DiffContext.h" #include "DIFF.H" #include "DiffUtils.h" +#include "coretools.h" namespace CompareEngines { @@ -240,21 +241,15 @@ return false; } - const char EolIndicators[] = "\r\n"; //List of characters used as EOL bool linesMatch = true; // set to false when non-matching line is found. int line = StartPos; while (line <= EndPos && linesMatch == true) { - std::string LineData(files[FileNo].linbuf[line]); - size_t EolPos = LineData.find_first_of(EolIndicators); - if (EolPos != std::string::npos) + const char *string = files[FileNo].linbuf[line]; + size_t stringlen = linelen(string); + if (!m_pFilterList->Match(stringlen, string, m_codepage)) { - LineData.erase(EolPos); - } - - if (!m_pFilterList->Match(LineData.c_str(), m_codepage)) - { linesMatch = false; } ++line; Modified: branches/R2_14/Src/DiffWrapper.cpp =================================================================== --- branches/R2_14/Src/DiffWrapper.cpp 2010-11-18 13:52:36 UTC (rev 7431) +++ branches/R2_14/Src/DiffWrapper.cpp 2010-11-18 14:16:08 UTC (rev 7432) @@ -1058,24 +1058,17 @@ return false; } - const char EolIndicators[] = "\r\n"; //List of characters used as EOL bool linesMatch = true; // set to false when non-matching line is found. int line = StartPos; while (line <= EndPos && linesMatch == true) { - char * linedata = strdup(files[FileNo].linbuf[line]); - int eolpos = strcspn(linedata, EolIndicators); - if (eolpos != strlen(linedata)) + const char *string = files[FileNo].linbuf[line]; + size_t stringlen = linelen(string); + if (!m_pFilterList->Match(stringlen, string, m_codepage)) { - linedata[eolpos] = '\0'; - } - - if (!m_pFilterList->Match(linedata, m_codepage)) - { linesMatch = false; } - free(linedata); ++line; } return linesMatch; Modified: branches/R2_14/Src/FileFilterHelper.cpp =================================================================== --- branches/R2_14/Src/FileFilterHelper.cpp 2010-11-18 13:52:36 UTC (rev 7431) +++ branches/R2_14/Src/FileFilterHelper.cpp 2010-11-18 14:16:08 UTC (rev 7432) @@ -254,7 +254,7 @@ strFileName = strFileName + _T('.'); char * name_utf = UCS2UTF8_ConvertToUtf8(strFileName); - bool match = m_pMaskFilter->Match(name_utf); + bool match = m_pMaskFilter->Match(strlen(name_utf), name_utf); UCS2UTF8_Dealloc(name_utf); return match; } Modified: branches/R2_14/Src/FilterList.cpp =================================================================== --- branches/R2_14/Src/FilterList.cpp 2010-11-18 13:52:36 UTC (rev 7431) +++ branches/R2_14/Src/FilterList.cpp 2010-11-18 14:16:08 UTC (rev 7432) @@ -106,11 +106,10 @@ * @param [in] codepage codepage of string. * @return true if any of the expressions did match the string. */ -bool FilterList::Match(const char *string, int codepage/*=CP_UTF8*/) +bool FilterList::Match(size_t stringlen, const char *string, int codepage/*=CP_UTF8*/) { bool retval = false; unsigned int count = m_list.size(); - int stringlen = strlen(string); // convert string into UTF-8 ucr::buffer buf(stringlen * 2); Modified: branches/R2_14/Src/FilterList.h =================================================================== --- branches/R2_14/Src/FilterList.h 2010-11-18 13:52:36 UTC (rev 7431) +++ branches/R2_14/Src/FilterList.h 2010-11-18 14:16:08 UTC (rev 7432) @@ -48,7 +48,7 @@ void AddRegExp(const char *regularExpression, EncodingType encoding); void RemoveAllFilters(); bool HasRegExps(); - bool Match(const char *string, int codepage = CP_UTF8); + bool Match(size_t stringlen, const char *string, int codepage = CP_UTF8); const char * GetLastMatchExpression(); private: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |