From ba935673e5e91add0a222a4f26562a1634837d08 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Thu, 3 Jan 2013 01:17:59 +0000 Subject: [PATCH] [BUG_FIXED] (Author: Mike Stratoti) Enhance and stabilize the build. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@999 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/MISC/Common/Common.cpp | 4 +++- .../src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/PowerEditor/src/MISC/Common/Common.cpp b/PowerEditor/src/MISC/Common/Common.cpp index 3d12d42af..29753f8d7 100644 --- a/PowerEditor/src/MISC/Common/Common.cpp +++ b/PowerEditor/src/MISC/Common/Common.cpp @@ -85,7 +85,9 @@ void folderBrowser(HWND parent, int outputCtrlID, const TCHAR *defaultStr) info.ulFlags = 0; info.lpfn = BrowseCallbackProc; TCHAR directory[MAX_PATH]; - ::GetDlgItemText(parent, outputCtrlID, directory, sizeof(directory)); + ::GetDlgItemText(parent, outputCtrlID, directory, _countof(directory)); + directory[_countof(directory) - 1] = '\0'; + if (!directory[0] && defaultStr) info.lParam = reinterpret_cast(defaultStr); else diff --git a/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp b/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp index 9a0da21bd..2848dd782 100644 --- a/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp +++ b/PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp @@ -144,7 +144,7 @@ bool XmlMatchedTagsHighlighter::getXmlMatchedTagsPos(XmlMatchedTagsPos &xmlTags) openFound = findText("<", searchStartPoint, 0, 0); styleAt = _pEditView->execute(SCI_GETSTYLEAT, openFound.start); searchStartPoint = openFound.start - 1; - } while(openFound.success && (styleAt == SCE_H_DOUBLESTRING || styleAt == SCE_H_DOUBLESTRING) && searchStartPoint > 0); + } while (openFound.success && (styleAt == SCE_H_DOUBLESTRING || styleAt == SCE_H_SINGLESTRING) && searchStartPoint > 0); if (openFound.success && styleAt != SCE_H_CDATA) { @@ -156,7 +156,7 @@ bool XmlMatchedTagsHighlighter::getXmlMatchedTagsPos(XmlMatchedTagsPos &xmlTags) closeFound = findText(">", searchStartPoint, caret, 0); styleAt = _pEditView->execute(SCI_GETSTYLEAT, closeFound.start); searchStartPoint = closeFound.end; - } while (closeFound.success && (styleAt == SCE_H_DOUBLESTRING || styleAt == SCE_H_DOUBLESTRING) && searchStartPoint <= caret); + } while (closeFound.success && (styleAt == SCE_H_DOUBLESTRING || styleAt == SCE_H_SINGLESTRING) && searchStartPoint <= caret); if (!closeFound.success) {